commit e6f8cb29ec349b7406050914c1b128d33112ca69
author Julius D'souza <jdsouza@google.com> Wed Dec 14 10:30:25 2016 -0800
committer Julius D'souza <jdsouza@google.com> Wed Dec 14 10:31:12 2016 -0800
tree d983834e60d0460f39af650636e64af8a2c45d26
parent f9f39cc4a870f1af4470ed4d5f876b5a2d37afa2

fix case issues with mGoingIdleWakeLock in DeviceIdleController

Bug: 31900521

Change-Id: I9484b10f0e6b99dfaf11266bb275a31d7ff3868c

services/core/java/com/android/server/DeviceIdleController.java

diff --git a/services/core/java/com/android/server/DeviceIdleController.java b/services/core/java/com/android/server/DeviceIdleController.java
index 9c04e61..5ca40ff 100644
--- a/services/core/java/com/android/server/DeviceIdleController.java
+++ b/services/core/java/com/android/server/DeviceIdleController.java
@@ -172,7 +172,7 @@
     /**
      * Wakelock held when going idle so hardware (especially NetworkPolicyManager) can shut down.
      */
-    private PowerManager.WakeLock mGoingIdleWakelock;
+    private PowerManager.WakeLock mGoingIdleWakeLock;
 
     public final AtomicFile mConfigFile;
 
@@ -710,7 +710,7 @@
                     handleWriteConfigFile();
                 } break;
                 case MSG_REPORT_IDLE_ON: {
-                    // mGoingIdleWakelock is held at this point
+                    // mGoingIdleWakeLock is held at this point
                     EventLogTags.writeDeviceIdleOnStart();
                     mLocalPowerManager.setDeviceIdleMode(true);
                     try {
@@ -720,7 +720,7 @@
                     }
                     getContext().sendBroadcastAsUser(mIdleIntent, UserHandle.ALL);
                     EventLogTags.writeDeviceIdleOnComplete();
-                    mGoingIdleWakelock.release();
+                    mGoingIdleWakeLock.release();
                 } break;
                 case MSG_REPORT_IDLE_OFF: {
                     EventLogTags.writeDeviceIdleOffStart("unknown");
@@ -1411,7 +1411,7 @@
                 mNextIdleDelay = Math.min(mNextIdleDelay, mConstants.MAX_IDLE_TIMEOUT);
                 mState = STATE_IDLE;
                 EventLogTags.writeDeviceIdle(mState, "step");
-                mGoingIdleWakelock.acquire();
+                mGoingIdleWakeLock.acquire();
                 mHandler.sendEmptyMessage(MSG_REPORT_IDLE_ON);
                 break;
             case STATE_IDLE: