Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix case issues with mGoingIdleWakeLock in DeviceIdleController

Browse Source 
Bug: 31900521

Change-Id: I9484b10f0e6b99dfaf11266bb275a31d7ff3868c
This commit is contained in:
Julius D'souza
2016-12-14 10:30:25 -08:00
parent f9f39cc4a8
commit e6f8cb29ec
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
services/core/java/com/android/server/DeviceIdleController.java
View File

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