hand merge "SystemUI: nav bar code cleanup & app icon size fix

- removed debugging code/cleaned up some code
- added padding to app icons to make them fit in better

Change-Id: Ib18c2b7145ae1ed232195bfcdd78e517d428cdf5"

[romanbb]
audio: Squashed commit of LPA support from CAF

* Patches wrangled by Kali

frameworks/base: LPA and routing api  implementation

- Integrated routing APIs for LPA with the new AUDIO HAL
- Integrated LPAPlayer for LPA Playback on 8660

Change-Id: I345f62afa53057261602042ac348d43333cc8732

libstagefright: Integrate LPAPlayerALSA for LPA playback on 8960

Change-Id: Ie7ec686bef7a8c0b41c06ae11bdf49f84e136197

frameworks/base: Fix for no audio while playing specific ADIF clips

- Now the SW AAC Decoder is OMX based and handles decoding from the
  beginning after the port reconfiguration. So it is not required to
  force seeking to the beginning when INFO_FORMAT_CHANGED received,
  after decoding the first frame.
- Removed the same to fix no audio issue with specific ADIF clips
  which reports INFO_FORMAT_CHANGED.

Change-Id: I057312d1f9e0e5ced26bb5234cbc79d95be53b1b
CRs-fixed: 321723

libstagefright: fix for crash in AwesomePlayer startAudioPlayer_l

-Issue: check(seeking) fails in startAudioPlayer_l for LPA playback
-Cause: LPAPlayer does not set seeking flag after starting playback
in the middle of a clip
-Fix: Set mSeeking flag and ReadOptions in LPAPlayer::Start

Change-Id: Iac91a2b328be41cb98f6fdfa7c62e0b93a3a48a4
CRs-fixed: 322725

frameworks/base: Fix for pause/resume issue while LPA playback

- If LPA playback is paused and resumed immediately, the audio
  resumes for sometime and then the playback switches to next
  clip due to error in OMXCodec.
- In the LPA pause implementation, the source, OMXCodec, pause
  is being called which does not handle executing to pause
  state transition. So this causes decoding issue while resuming.
- Removed unnecessary pause/resume API calls to OMXCodec to fix
  the issue.

Change-Id: Ic7713c43aeedd9ec4818def9275653e7756e3a91
CRs-fixed: 322324

libstagefright:Fix for no progress bar update while seeking at end of LPA clip

-progress bar doesnt update while seeking at end of LPA clip.
-EOS is not posted to Awesome player when i/p EOS is reached,all input buffers have been decoded
and response queue is empty.
-Post EOS to Awesome player when i/p EOS is reached,all input buffers have been decoded
and response queue is empty.
CRs-Fixed: 321961

Change-Id: I6f90ac577825d807b99e724b3948f7cca1478e8d

frameworks/base: Enable Audio effects for LPA output

- Added the support to apply Audio Effects on LPA output.

Change-Id: I08b64167e9beac7fbe84ad2610f0177766be7c7e

frameworks/base:Fix for memory leaks during LPA playback

-Sigkill errors while running audio monkey causing the device the monkey to stop
 Memory is getting critically low leading to background process getting killed
 by the OOM killer.
-Memory leaks during LPA playback is leading to memory exhaution.
-Fixing the memory leaks.

Change-Id: I546d2a08d33789b3433d8ea61c30f6cba02a9f7c
CRs-Fixed: 326720

libstagefirght: Update timeStarted to use system time in LPAPlayer::start

- Issues: Paussing LPA clips at the last second causes the control to
the end of next clip
- Causes: TimeStarted is not updated correctly if pause cmd is received
before decoder thread starts.
- FIX: Update timeStarted to use system time in LPAPlayer::start()

Change-Id: If01b397b251c8aa20feed581c260d5ff818a2834
CRs-fixed: 324298

frameworks/base: Prevent effects application in paused state

- The issue is that effects are being applied on the LPA buffers
  in paused state.
- After 3s in paused state, session of the playback is
  deregistered hence effects should not be applied
- The issue is fixed by stalling the effects thread till the
  playback is resumed and session for LPA is re-establised with
  MediaPlayerService

Change-Id: I87f0f1cfcaaaf0f95a7218f46ea76d043c84bb77
CRs-Fixed: 328300

frameworks/base: Syncronize resume and onPauseTimeOut

- All the mixer controls are closed 3s after pausing playback
  through the onPauseTimeOut function
- A scenario where onPauseTimeOut is closing mixer controls, a
  resume is issued, causes a crash
- Synchronize these 2 functions using a mutex to prevent
  concurrent execution.

Change-Id: Ic0e84423f7e3e4a26c441c73235e61d9a13c225d
CRs-Fixed: 329312

frameworks/base : Prevent pcm_prepare when A2DP is enabled

- pcm_prepare should not be called without setting routing
controls, as this will result in driver bad state.
- Fix the issue by calling pcm_prepare only when A2DP is not
enabled and routing controls are set.

Change-Id: Ic2db9224d70500c392fa31804844aa934eca633d
CRs-fixed: 327396

libstagefright: Flush ASM before closing the stream

- By calling pcm_prepare we can flush the driver and
  dsp so that playback close can issue an eos from kernel

Change-Id: Icb5249ff8c480405b4b8ac5ce5f995ed5d73bf0d
CRs-Fixed: 331532
(cherry picked from commit 8bdfa12)

libstagefright: Fix for seek issue in mp3 streaming playback

-Issue: In LPA playback if seek is issued, the pcm driver
starts after a fill buffer and write is completed. If pause is
issued before the driver starts, audio pause fails and results
to a sudden jump in the playback or to an EOS at random

-Testscenario: Flush,immediately followed by Pause in LPA playback.

-Fix: Pause is handled when the pcm write is completed. This is
acheived by a conditional wait on the pcm write done.

CRs-Fixed: 331099
(cherry picked from commit 6ce1598)

Change-Id: I605316bba2d964ba3d52f6a7cc42e7e390d92fdf

libstagefright: prevent trigger for stale events

- prevent event thread from running if response queue is empty which
  means there is no buffer with the driver

CRs-Fixed: 336970
(cherry picked from commit 690fb2d)

Change-Id: Ie86a900e77175b2786cfe10fc0c64457e9fc4bae

libstagefright: Ensure pcm_prepare is called only when routing is
still active.

- LPAPlayer does Derouting, pcm_prepare and pcm_close during pause.
- pcm_prepare should not be called after derouting, as the driver
tries to prepare a session which is already derouted.
- This results in no backend errors in kernel for LPA Front end
session as the backend is already closed with derouting.
- Fix the issue by ensuring pcm_prepare is always called only
routing is still active.

Change-Id: I4b4eef7f9775b6141a5ec9a0eed82ca2f7a5c6d6
CRs-fixed: 341268

libstagefright: Add support in LPA for DSP timestamp.

Change-Id: Ie9525b0ab201b9de828a25ef1cd9731567f4610a
CRs-Fixed: 338065
(cherry picked from commit 2457cb3)

libstagefright: honor write done event during pause

Queue up completed buffers for decoding even if playback
is in paused state as there is concurrency between write
done and pause

CRs-Fixed: 340469
(cherry picked from commit c9116b6)

Change-Id: Ifdc2cec4d92773ac279c02df7067bd95c32ca4a4

libstagefright: Fix A2DP seek to EOS issue in LPA

- In A2dp scenario, when seeked to EOS and 0 bytes returned by decoder,
  eos was not issued to the app. This resulted in no audio.
- Put the buffer back in the request queue in case of 0 decoded bytes
  and post an AudioEOS event to the app.

Change-Id: Icb2cc053d71d02c8adb90fc5be1922ea813331e9
CRs-Fixed: 339608
(cherry picked from commit cdcdc2e)

Conflicts:

	media/libstagefright/LPAPlayerALSA.cpp

LPAPlayerALSA: Fix for acquire/release Wake-locks.

 -Requires a wake lock to ensure that 3s timer after playback runs
 in suspend mode to get into TCXO shutdown.
 -Add support for acquiring wake locks from mediaserver process
 -PowerService is used for acquiring/releasing wakelock

Change-Id: Icb21c319eee24aa38d56afcd8eddcb6315b74558
CRs-Fixed: 338542

libstagefright: Fix concurrency issue during A2DP switch.

- When A2DP is disconnected, Pause is issued by the app.
  Sometimes, pause happens concurrently with stop, resulting a
  stuck in write.
- Fix the issue by switching the sessions, when resuming the
  playback so that above concurrency is avoided.

CRs-Fixed: 338086
(cherry picked from commit 29c0c17)

Change-Id: I7ee7a3ca0569006c404cb5cca885271b53476695

libstagefright: Initialize audio routing flag in the constructor

If the audio routing flag is not initialized, it could result in
some rare errors which will cause routing to be in bad state.

(cherry picked from commit 74d381b)

Change-Id: I3f4b9b3e172921a397f4ad2a55c8e0e429af13bc

libstagefright: Fix for application not responding when going to next song

- When a song is ended, the driver is paused, flushed and then close.
- The issue is that under some scenario, the song is ended before the
  driver is initialized. Pausing the driver as result causes a native
  crash
- Issue is fixed by only issuing the pause to the driver if it is
  started.

Change-Id: Ib839a087136526e9186fc37c8cb29c681612e6c9
CRs-Fixed: 339578
(cherry picked from commit a711732)

libstagefright: Add wake lock support for LPAPlayerALSA

- LPAPlayerALSA now holds the wake lock while LPA playback is
  on going
- This allows external applications who do not hold wake lock
  to use LPA playback

CRs-Fixed: 342451
(cherry picked from commit 9621db1)

Change-Id: I3ff8bbdc2535e29b3e0b94953d9ce6364b5c0782

libstagefright: pause AudioStream when bt is disconnected.

Notify AudioPolicyManager that device is in paused state when
BT is disconnected

CRs-Fixed: 349091
(cherry picked from commit e2fd42a43f92696f917b74b23a1cce9ac276a707)

Change-Id: I5377f8568e1fccb11685ca0e718968eb1823d539

libstagefright: Decrease LPA buffer size to 256 kb

CRs-Fixed: 344793

Conflicts:

	media/libstagefright/LPAPlayerALSA.cpp

Change-Id: Ia9d13985dffa0473b3bdadc547eeb06b114b5a8b

libstagefright: Change thread priority for LPA threads

- Since A2DP behaves like a render thread, there is a need for it
  run at urgent audio priority.

(cherry picked from commit 3b81741adf7b743cfa72874f63bf561950c9cd22)

Change-Id: I9d7ee924766fef1ac77c47dc445d8d32a305d700

libstagefright: Update LPA Player to use ION

Create LPAPlayerION and LPAPlayerPMEM files to separate
memory allocation using ION and PMEM and change the
existing files accordingly.

CRs-fixed: 341467
(cherry picked from commit 63a2671e848d5f8bc9295706974d5c7bee7b2002)

Change-Id: Ife594fb9c36a98d4a3be47ae4140a9c82ec477f7

frameworks/base: Fix to prevent deadlocks with Audioeffects.

-Initialization of LPAeffectschain is not protected and
 locking/unlocking the Effectschain based on this value
 can lead to a deadlock scenario's during Stability or
 Monkey runs on Music app with Audioeffects in action.
-Protect the initialization of LPAeffectschain.

CRs-Fixed: 336281
(cherry picked from commit f0c6443679b0244a6cddf3042aa4b92b69f4d178)

Change-Id: I27ec5b6cbbd3c6e72fb234542aa159ebec5df6be

AudioFlinger: Fix for LPA volume change when headset connected.

-When headset connected, volume is increased for LPA media
 playback in repeat mode.
-Fixed volume setting in LPA mode.

CRs-Fixed: 339790
(cherry picked from commit bc410c04dfed2caca9759e6eaf1ada6984f359cb)

Change-Id: Id94920580384812353e3ae95f8f61511a1ec37c2

frameworks/base: Add support for LPA volume control using mediaplayer API.

-Issue: Setting LPA volume using MediaPlayer::setVolume()
API fails.
-Cause: Current implementation of this API has only software
decoder volume setting.
-Fix: Add support to call kernel API for volume,
as LPA volume is applied in DSP.

Change-Id: If2eee5d03f421b1097b9a7f53d3ba3e4f293f4d8
CRs-Fixed: 317323

frameworks/base: Do not use LPA mode for ADIF clips

- When ADIF clips are being played in LPA mode, if it is paused for
  more than 3sec and resumed, it results ANR
- This is due to the limitation that ADIF playback cannot be seeked.
  When LPA playback is paused for more than 3sec, all the buffers
  with LPA driver are flused and closed. On Resume, it tries to seek
  to the paused location, where it fails for ADIF clips.
- Fixed by not allowing ADIF clips in LPA mode.

Change-Id: I25890844b0a28a474c9ac073d2576fca56f60e8c
CRs-fixed: 324296

libstagefright: Fix LPA mute issue via browser.

-When Playing LPA clip via HTML link, mute option
fails to work.
-In MediaPlayerService, setVolume API handles only
for non-LPA case. Need to change to call LPA Volume
update too.
-Call mSession setVolume incase of LPA. The AudioFlinger
has to keep track of previous volume when muted. This
volume is again applied back when unmuted since App
sents volume as unity when unmuted which is not the previous
volume before mute. This change fixes the below issues
--mute/unmute option via browser
--increase/decrease volume when mute-should not affect mute option.
--While in mute pause for 3sec and resume,mute is lost.

CRs-Fixed: 327159
(cherry picked from commit 440de6deaae11b527b7250039e5172a690152e8c)

Change-Id: I73e9773f0a507c47947051bceebeb013ebca8e67

media/libmedia: Release the session only for non-lpa clip

Issue 1:
- The session id is not acquired for LPA clips in AudioTrack
  however destructor tries to release it at the end of LPA
  Playback.
- This cause corruption and eventually causes the ref count
  to decrease on every LPA clip. As a result the application
  of effects is not consistent
- This issue is fixed by releasing the session only during
  non-lpa clip

Issue 2:
- There was noise for initial buffers during LPA playback
- Mixer thread was applying effects for LPA effect chain
- Prevent this by ensuring when lpa session is active,
  mixer thread does not apply effects on the LPA chain

(cherry picked from commit 95932d301acf6d331fd8c42154ae69a7c98a9a33)

Change-Id: I96dbbab831f21bc40ff98f202902ee753ab61fb6
CRs-Fixed: 328645

libstagefright: Create new AAC and MP3 decoder libraries without OMX layer

- With the current AAC and MP3 OMX SW decoders, the decoding time
  is increased w.r.t the libraries without OMX layer that are
  present in GB. This increase in decoding time results reduction in
  power savings in LPA mode.
- This commit is to remove OMX layer for AAC and MP3 to reduce the
  power consumption in LPA mode.

(cherry picked from commit 16b4260ff4a200b2ad69290be714578ffa33424f)

Change-Id: I4ef13031207952074d0788a8953ebc38cfe48cee
CRs-fixed: 334400

fix build

Change-Id: I8fe32083911a41e1517b9e73b618521b38a0db25

Tejas Shikhare authored
QualcommSharedRIL: Check call status before validating data call state

Ported over from CAF's change Iea75053cb8226ec15d2a2c11a73332e5ebe8c793,
since applying it to the main RIL class breaks non-qcoms
Merge branch 'master' of github.com:NEXUS-EVOLUTION/frameworks_base