diff options
| author | Christine Chen <christinech@google.com> | 2013-10-21 12:23:48 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2013-10-21 12:23:48 -0700 |
| commit | 9cd06454eb6376d7423d71b8692894ab61aefec8 (patch) | |
| tree | 4224606fc56b5a1aa9ca6fbac761112a122151f5 | |
| parent | 047e80508396d2c481f5e174a299435d2d7e3799 (diff) | |
| parent | 086b5694eae08a299a2fc3c86196e71462e3d8d0 (diff) | |
am df563e46: am 11e202f4: Adds null check for proximity wakelock
* commit 'df563e46e974e225a2b8c164aa893ed5f454e029':
Adds null check for proximity wakelock
| -rw-r--r-- | InCallUI/src/com/android/incallui/ProximitySensor.java | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/InCallUI/src/com/android/incallui/ProximitySensor.java b/InCallUI/src/com/android/incallui/ProximitySensor.java index 5776b5630..607a54f8e 100644 --- a/InCallUI/src/com/android/incallui/ProximitySensor.java +++ b/InCallUI/src/com/android/incallui/ProximitySensor.java @@ -73,7 +73,7 @@ public class ProximitySensor implements AccelerometerListener.OrientationListene mAccelerometerListener.enable(false); - if (mProximityWakeLock.isHeld()) { + if (mProximityWakeLock != null && mProximityWakeLock.isHeld()) { mProximityWakeLock.release(); } } |