commit d3565c451b341f25e7328a20229079b1f0aab424
author Santos Cordon <santoscordon@google.com> Thu Sep 19 21:34:58 2013 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Thu Sep 19 21:34:58 2013 +0000
tree 0d78ae50906c7e5bf959864bf4ae92fc071eb098
parent 7b35331be8f517a072e2d38603f82caba49d9d91
parent dbe82d60839a629ebaa7d21878901883b51b5e16

Merge "Tear down proximity sensors when no longer in use." into klp-dev

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

diff --git a/InCallUI/src/com/android/incallui/InCallPresenter.java b/InCallUI/src/com/android/incallui/InCallPresenter.java
index bdbdf6d..4f687a8 100644
--- a/InCallUI/src/com/android/incallui/InCallPresenter.java
+++ b/InCallUI/src/com/android/incallui/InCallPresenter.java
@@ -519,6 +519,10 @@
             }
             mContactInfoCache = null;
 
+            if (mProximitySensor != null) {
+                removeListener(mProximitySensor);
+                mProximitySensor.tearDown();
+            }
             mProximitySensor = null;
 
             mAudioModeProvider = null;

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

diff --git a/InCallUI/src/com/android/incallui/ProximitySensor.java b/InCallUI/src/com/android/incallui/ProximitySensor.java
index 0dc54dc..5895c29 100644
--- a/InCallUI/src/com/android/incallui/ProximitySensor.java
+++ b/InCallUI/src/com/android/incallui/ProximitySensor.java
@@ -68,6 +68,16 @@
         mAudioModeProvider.addListener(this);
     }
 
+    public void tearDown() {
+        mAudioModeProvider.removeListener(this);
+
+        mAccelerometerListener.enable(false);
+
+        if (mProximityWakeLock.isHeld()) {
+            mProximityWakeLock.release();
+        }
+    }
+
     /**
      * Called to identify when the device is laid down flat.
      */