diff options
| author | Christine Chen <christinech@google.com> | 2013-10-21 12:27:05 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2013-10-21 12:27:05 -0700 |
| commit | 9ecbc8088b0373ef113b3bb264970149ba32dfea (patch) | |
| tree | c157fe975352a56a38942204a9c64265b3f5f901 | |
| parent | 72c65de66ffe580bc3f20e42dc42ec7cf7d17c1e (diff) | |
| parent | 9cd06454eb6376d7423d71b8692894ab61aefec8 (diff) | |
am 3254b9fa: am df563e46: am 11e202f4: Adds null check for proximity wakelock
* commit '3254b9fa2b3461035046a7a566ae4d21acb93f94':
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(); } } |