| commit | 11e202f49d4382bbf6271e90421c5db333f3b346 | [log] [tgz] |
|---|---|---|
| author | Christine Chen <christinech@google.com> | Mon Oct 21 12:07:38 2013 -0700 |
| committer | Christine Chen <christinech@google.com> | Mon Oct 21 12:07:38 2013 -0700 |
| tree | 8182b3065acdebd00457cc1f33178ec7d1edb6f9 | |
| parent | c7373e1f3081bf5b291980009a2fe0bbc67b8d89 [diff] |
Adds null check for proximity wakelock Bug: 11319677 Change-Id: Ie62144dc5a738bb294a802230dce7847f734f39e
diff --git a/src/com/android/incallui/ProximitySensor.java b/src/com/android/incallui/ProximitySensor.java index 5776b56..607a54f 100644 --- a/src/com/android/incallui/ProximitySensor.java +++ b/src/com/android/incallui/ProximitySensor.java
@@ -73,7 +73,7 @@ mAccelerometerListener.enable(false); - if (mProximityWakeLock.isHeld()) { + if (mProximityWakeLock != null && mProximityWakeLock.isHeld()) { mProximityWakeLock.release(); } }