commit 9d95f7e85da5ae18f326b8a4568110085f88ff82
author Makoto Onuki <omakoto@google.com> Mon Sep 16 17:05:01 2013 +0000
committer Makoto Onuki <omakoto@google.com> Mon Sep 16 17:05:01 2013 +0000
tree 51347c9b0757b39eb8926d38b8bd12cb22fcd76e
parent f4d9dfa2faf5da3f83c925f96686e8b545b31f7c

Revert "b/10699042 show dialpad when connects to voice mail."

This reverts commit f4d9dfa2faf5da3f83c925f96686e8b545b31f7c.

Change-Id: I50d96ff3f66839a3e690b732d1c80dfb28f06906

src/com/android/phone/CallHandlerServiceProxy.java

diff --git a/src/com/android/phone/CallHandlerServiceProxy.java b/src/com/android/phone/CallHandlerServiceProxy.java
index c1724d0..3c7b517 100644
--- a/src/com/android/phone/CallHandlerServiceProxy.java
+++ b/src/com/android/phone/CallHandlerServiceProxy.java
@@ -284,13 +284,13 @@
         }
     }
 
-    public void bringToForeground(boolean showDialpad) {
+    public void bringToForeground() {
         // only support this call if the service is already connected.
         synchronized (mServiceAndQueueLock) {
             if (mCallHandlerServiceGuarded != null && mCallModeler.hasLiveCall()) {
                 try {
-                    if (DBG) Log.d(TAG, "bringToForeground: " + showDialpad);
-                    mCallHandlerServiceGuarded.bringToForeground(showDialpad);
+                    if (DBG) Log.d(TAG, "bringToForeground");
+                    mCallHandlerServiceGuarded.bringToForeground();
                 } catch (RemoteException e) {
                     Log.e(TAG, "Exception handling bringToForeground", e);
                 }

src/com/android/phone/PhoneInterfaceManager.java

diff --git a/src/com/android/phone/PhoneInterfaceManager.java b/src/com/android/phone/PhoneInterfaceManager.java
index 1ce46b2..c37fe07 100644
--- a/src/com/android/phone/PhoneInterfaceManager.java
+++ b/src/com/android/phone/PhoneInterfaceManager.java
@@ -297,7 +297,7 @@
     }
 
     private boolean showCallScreenInternal(boolean specifyInitialDialpadState,
-                                           boolean showDialpad) {
+                                           boolean initialDialpadState) {
         if (!PhoneGlobals.sVoiceCapable) {
             // Never allow the InCallScreen to appear on data-only devices.
             return false;
@@ -308,7 +308,7 @@
         // If the phone isn't idle then go to the in-call screen
         long callingId = Binder.clearCallingIdentity();
 
-        mCallHandlerService.bringToForeground(showDialpad);
+        mCallHandlerService.bringToForeground();
 
         Binder.restoreCallingIdentity(callingId);
         return true;