resolve merge conflicts of 3ed74f4b6 to stage-aosp-master
[android/platform/frameworks/opt/telephony.git] / src / java / com / android / internal / telephony / imsphone / ImsPhoneConnection.java
index c45d4e3..9ee5723 100644 (file)
@@ -573,10 +573,12 @@ public class ImsPhoneConnection extends Connection implements
 
     void
     releaseWakeLock() {
-        synchronized(mPartialWakeLock) {
-            if (mPartialWakeLock.isHeld()) {
-                Rlog.d(LOG_TAG, "releaseWakeLock");
-                mPartialWakeLock.release();
+        if (mPartialWakeLock != null) {
+            synchronized (mPartialWakeLock) {
+                if (mPartialWakeLock.isHeld()) {
+                    Rlog.d(LOG_TAG, "releaseWakeLock");
+                    mPartialWakeLock.release();
+                }
             }
         }
     }