Rename launching and going-to-sleep wake locks
Test: build
Change-Id: I2a0df41fc71a54522a845728d0cb2ea411c17f83
diff --git a/services/core/java/com/android/server/wm/ActivityStackSupervisor.java b/services/core/java/com/android/server/wm/ActivityStackSupervisor.java
index c685b05..5beedfa 100644
--- a/services/core/java/com/android/server/wm/ActivityStackSupervisor.java
+++ b/services/core/java/com/android/server/wm/ActivityStackSupervisor.java
@@ -317,14 +317,14 @@
* receivers to launch an activity and get that to run before the device
* goes back to sleep.
*/
- PowerManager.WakeLock mLaunchingActivity;
+ PowerManager.WakeLock mLaunchingActivityWakeLock;
/**
* Set when the system is going to sleep, until we have
* successfully paused the current activity and released our wake lock.
* At that point the system is allowed to actually sleep.
*/
- PowerManager.WakeLock mGoingToSleep;
+ PowerManager.WakeLock mGoingToSleepWakeLock;
/**
* Temporary rect used during docked stack resize calculation so we don't need to create a new
@@ -467,10 +467,10 @@
*/
void initPowerManagement() {
mPowerManager = mService.mContext.getSystemService(PowerManager.class);
- mGoingToSleep = mPowerManager
+ mGoingToSleepWakeLock = mPowerManager
.newWakeLock(PARTIAL_WAKE_LOCK, "ActivityManager-Sleep");
- mLaunchingActivity = mPowerManager.newWakeLock(PARTIAL_WAKE_LOCK, "*launch*");
- mLaunchingActivity.setReferenceCounted(false);
+ mLaunchingActivityWakeLock = mPowerManager.newWakeLock(PARTIAL_WAKE_LOCK, "*launch*");
+ mLaunchingActivityWakeLock.setReferenceCounted(false);
}
void setWindowManager(WindowManagerService wm) {
@@ -1205,14 +1205,14 @@
}
void setLaunchSource(int uid) {
- mLaunchingActivity.setWorkSource(new WorkSource(uid));
+ mLaunchingActivityWakeLock.setWorkSource(new WorkSource(uid));
}
void acquireLaunchWakelock() {
if (VALIDATE_WAKE_LOCK_CALLER && Binder.getCallingUid() != Process.myUid()) {
throw new IllegalStateException("Calling must be system uid");
}
- mLaunchingActivity.acquire();
+ mLaunchingActivityWakeLock.acquire();
if (!mHandler.hasMessages(LAUNCH_TIMEOUT_MSG)) {
// To be safe, don't allow the wake lock to be held for too long.
mHandler.sendEmptyMessageDelayed(LAUNCH_TIMEOUT_MSG, LAUNCH_TIMEOUT);
@@ -1294,13 +1294,13 @@
mService.scheduleAppGcsLocked();
}
- if (mLaunchingActivity.isHeld()) {
+ if (mLaunchingActivityWakeLock.isHeld()) {
mHandler.removeMessages(LAUNCH_TIMEOUT_MSG);
if (VALIDATE_WAKE_LOCK_CALLER &&
Binder.getCallingUid() != Process.myUid()) {
throw new IllegalStateException("Calling must be system uid");
}
- mLaunchingActivity.release();
+ mLaunchingActivityWakeLock.release();
}
mRootActivityContainer.ensureActivitiesVisible(null, 0, !PRESERVE_WINDOWS);
}
@@ -1964,13 +1964,13 @@
void goingToSleepLocked() {
scheduleSleepTimeout();
- if (!mGoingToSleep.isHeld()) {
- mGoingToSleep.acquire();
- if (mLaunchingActivity.isHeld()) {
+ if (!mGoingToSleepWakeLock.isHeld()) {
+ mGoingToSleepWakeLock.acquire();
+ if (mLaunchingActivityWakeLock.isHeld()) {
if (VALIDATE_WAKE_LOCK_CALLER && Binder.getCallingUid() != Process.myUid()) {
throw new IllegalStateException("Calling must be system uid");
}
- mLaunchingActivity.release();
+ mLaunchingActivityWakeLock.release();
mHandler.removeMessages(LAUNCH_TIMEOUT_MSG);
}
}
@@ -2012,8 +2012,8 @@
void comeOutOfSleepIfNeededLocked() {
removeSleepTimeouts();
- if (mGoingToSleep.isHeld()) {
- mGoingToSleep.release();
+ if (mGoingToSleepWakeLock.isHeld()) {
+ mGoingToSleepWakeLock.release();
}
}
@@ -2043,8 +2043,8 @@
removeSleepTimeouts();
- if (mGoingToSleep.isHeld()) {
- mGoingToSleep.release();
+ if (mGoingToSleepWakeLock.isHeld()) {
+ mGoingToSleepWakeLock.release();
}
if (mService.mShuttingDown) {
mService.mGlobalLock.notifyAll();
@@ -2553,13 +2553,13 @@
} break;
case LAUNCH_TIMEOUT_MSG: {
synchronized (mService.mGlobalLock) {
- if (mLaunchingActivity.isHeld()) {
+ if (mLaunchingActivityWakeLock.isHeld()) {
Slog.w(TAG, "Launch timeout has expired, giving up wake lock!");
if (VALIDATE_WAKE_LOCK_CALLER
&& Binder.getCallingUid() != Process.myUid()) {
throw new IllegalStateException("Calling must be system uid");
}
- mLaunchingActivity.release();
+ mLaunchingActivityWakeLock.release();
}
}
} break;
diff --git a/services/core/java/com/android/server/wm/ActivityTaskManagerService.java b/services/core/java/com/android/server/wm/ActivityTaskManagerService.java
index 258819f..2e3fb96 100644
--- a/services/core/java/com/android/server/wm/ActivityTaskManagerService.java
+++ b/services/core/java/com/android/server/wm/ActivityTaskManagerService.java
@@ -6807,8 +6807,9 @@
pw.println(" mController=" + mController
+ " mControllerIsAMonkey=" + mControllerIsAMonkey);
}
- pw.println(" mGoingToSleep=" + mStackSupervisor.mGoingToSleep);
- pw.println(" mLaunchingActivity=" + mStackSupervisor.mLaunchingActivity);
+ pw.println(" mGoingToSleepWakeLock=" + mStackSupervisor.mGoingToSleepWakeLock);
+ pw.println(" mLaunchingActivityWakeLock="
+ + mStackSupervisor.mLaunchingActivityWakeLock);
}
return needSep;
@@ -6840,8 +6841,9 @@
proto.write(IS_A_MONKEY, mControllerIsAMonkey);
proto.end(token);
}
- mStackSupervisor.mGoingToSleep.writeToProto(proto, GOING_TO_SLEEP);
- mStackSupervisor.mLaunchingActivity.writeToProto(proto, LAUNCHING_ACTIVITY);
+ mStackSupervisor.mGoingToSleepWakeLock.writeToProto(proto, GOING_TO_SLEEP);
+ mStackSupervisor.mLaunchingActivityWakeLock.writeToProto(proto,
+ LAUNCHING_ACTIVITY);
}
if (mHomeProcess != null && (dumpPackage == null
diff --git a/services/tests/wmtests/src/com/android/server/wm/ActivityTestsBase.java b/services/tests/wmtests/src/com/android/server/wm/ActivityTestsBase.java
index abc0bd6..8c97365 100644
--- a/services/tests/wmtests/src/com/android/server/wm/ActivityTestsBase.java
+++ b/services/tests/wmtests/src/com/android/server/wm/ActivityTestsBase.java
@@ -598,7 +598,7 @@
doNothing().when(this).acquireLaunchWakelock();
doReturn(mKeyguardController).when(this).getKeyguardController();
- mLaunchingActivity = mock(PowerManager.WakeLock.class);
+ mLaunchingActivityWakeLock = mock(PowerManager.WakeLock.class);
initialize();
}