summaryrefslogtreecommitdiff
path: root/InCallUI
diff options
context:
space:
mode:
authorChristine Chen <christinech@google.com>2013-10-21 12:07:38 -0700
committerChristine Chen <christinech@google.com>2013-10-21 12:07:38 -0700
commit174dcfc5ca5d7f63e03c1a6fe0acfd482331cba2 (patch)
treec157fe975352a56a38942204a9c64265b3f5f901 /InCallUI
parentef74eb94659d155844339562f7378b7c3cc51dd7 (diff)
Adds null check for proximity wakelock
Bug: 11319677 Change-Id: Ie62144dc5a738bb294a802230dce7847f734f39e
Diffstat (limited to 'InCallUI')
-rw-r--r--InCallUI/src/com/android/incallui/ProximitySensor.java2
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();
}
}