InCallUI : volume boost unexpected turn off

Fix the volume boost unexpected turn off when hold phone or Call status
changed.

CRs-Fixed: 601169

Change-Id: I32370189e1e4cdcb975df756f48d683752dc619c

2 files changed, 7 insertions, 1 deletions

diff --git a/src/com/android/incallui/CallCardFragment.java b/src/com/android/incallui/CallCardFragment.java
index ea2acf4f..4b8d311f 100644
--- a/src/com/android/incallui/CallCardFragment.java
+++ b/src/com/android/incallui/CallCardFragment.java
@@ -908,7 +908,7 @@ public class CallCardFragment extends BaseFragment<CallCardPresenter, CallCardPr
 
         if (Call.State.ACTIVE == state) {
             mVBButton.setVisibility(View.VISIBLE);
-        } else if (Call.State.DISCONNECTED == state) {
+        } else if (Call.State.DISCONNECTED == state || Call.State.IDLE == state) {
             if (!CallList.getInstance().existsLiveCall()
                     && mAudioManager.getParameters(VOLUME_BOOST).contains("=on")) {
                 mVBButton.setVisibility(View.INVISIBLE);
diff --git a/src/com/android/incallui/CallHandlerService.java b/src/com/android/incallui/CallHandlerService.java
index ca1f5814..29e4fb5f 100644
--- a/src/com/android/incallui/CallHandlerService.java
+++ b/src/com/android/incallui/CallHandlerService.java
@@ -375,6 +375,12 @@ public class CallHandlerService extends Service {
      * Whenever call audio device change, turn off volume boost function.
      * */
     private void updateVBStatus(int newMode) {
+        /* When normal call audio mode changed, disable the volume boost */
+        if (!(newMode == AudioMode.EARPIECE || newMode == AudioMode.BLUETOOTH
+                || newMode == AudioMode.WIRED_HEADSET || newMode == AudioMode.SPEAKER)) {
+            return;
+        }
+
         if (newMode != mAudioModeProvider.getAudioMode()
                 && mAudioManager.getParameters(VOLUME_BOOST).contains("=on")) {
             mAudioManager.setParameters(VOLUME_BOOST + "=off");