From 174dcfc5ca5d7f63e03c1a6fe0acfd482331cba2 Mon Sep 17 00:00:00 2001
From: Christine Chen <christinech@google.com>
Date: Mon, 21 Oct 2013 12:07:38 -0700
Subject: Adds null check for proximity wakelock

Bug: 11319677
Change-Id: Ie62144dc5a738bb294a802230dce7847f734f39e
---
 InCallUI/src/com/android/incallui/ProximitySensor.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'InCallUI')

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();
         }
     }
-- 
cgit v1.2.3