diff options
| author | Christine Chen <christinech@google.com> | 2013-10-21 12:21:09 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2013-10-21 12:21:09 -0700 |
| commit | 086b5694eae08a299a2fc3c86196e71462e3d8d0 (patch) | |
| tree | cdb107708859499eccd68b4718b363c80dfb21e3 /InCallUI | |
| parent | 3a05889bf0530bcf29f347b86ddcc6283c3fda87 (diff) | |
| parent | 174dcfc5ca5d7f63e03c1a6fe0acfd482331cba2 (diff) | |
am 11e202f4: Adds null check for proximity wakelock
* commit '11e202f49d4382bbf6271e90421c5db333f3b346':
Adds null check for proximity wakelock
Diffstat (limited to 'InCallUI')
| -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(); } } |