commit b83497fb00f9122f6555856927899e37b280637d
author Jay Shrauner <shrauner@google.com> Wed Oct 09 22:41:51 2013 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Wed Oct 09 22:41:52 2013 +0000
tree 01cc8cda21690c7ba3beae1f9bbbac0bcc817386
parent 852fb5d924dceaf9cf142d3e48548e7bbf6c18a6
parent b7d40f36747d00c353f77e6fcdb11022fa28e349

Merge "Catch potential NPE" into klp-dev

InCallUI/src/com/android/incallui/CallButtonPresenter.java

diff --git a/InCallUI/src/com/android/incallui/CallButtonPresenter.java b/InCallUI/src/com/android/incallui/CallButtonPresenter.java
index 3642630..3b1411b 100644
--- a/InCallUI/src/com/android/incallui/CallButtonPresenter.java
+++ b/InCallUI/src/com/android/incallui/CallButtonPresenter.java
@@ -33,7 +33,6 @@
         implements InCallStateListener, AudioModeListener, IncomingCallListener {
 
     private Call mCall;
-    private ProximitySensor mProximitySensor;
     private boolean mAutomaticallyMuted = false;
     private boolean mPreviousMuteState = false;
 
@@ -49,7 +48,6 @@
     public void onUiReady(CallButtonUi ui) {
         super.onUiReady(ui);
 
-        mProximitySensor = InCallPresenter.getInstance().getProximitySensor();
         AudioModeProvider.getInstance().addListener(this);
 
         // register for call state changes last
@@ -64,8 +62,6 @@
         InCallPresenter.getInstance().removeListener(this);
         AudioModeProvider.getInstance().removeListener(this);
         InCallPresenter.getInstance().removeIncomingCallListener(this);
-
-        mProximitySensor = null;
     }
 
     @Override
@@ -210,8 +206,6 @@
     public void showDialpadClicked(boolean checked) {
         Log.v(this, "Show dialpad " + String.valueOf(checked));
         getUi().displayDialpad(checked);
-        mProximitySensor.onDialpadVisible(checked);
-
         updateExtraButtonRow();
     }
 

InCallUI/src/com/android/incallui/InCallActivity.java

diff --git a/InCallUI/src/com/android/incallui/InCallActivity.java b/InCallUI/src/com/android/incallui/InCallActivity.java
index ac21d52..58db132 100644
--- a/InCallUI/src/com/android/incallui/InCallActivity.java
+++ b/InCallUI/src/com/android/incallui/InCallActivity.java
@@ -389,6 +389,8 @@
             mDialpadFragment.setVisible(false);
             mCallCardFragment.setVisible(true);
         }
+
+        InCallPresenter.getInstance().getProximitySensor().onDialpadVisible(showDialpad);
     }
 
     public boolean isDialpadVisible() {