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

Merge "Don't re-launch stopped activities while the device is sleeping" into nyc-dev

Browse Source
This commit is contained in:
TreeHugger Robot
2016-06-20 23:03:45 +00:00
committed by Android (Google) Code Review
parent bd45be5032 089586fd91
commit f159b74608
1 changed files with 10 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
services/core/java/com/android/server/am/ActivityStack.java
View File

@@ -4448,7 +4448,7 @@ final class ActivityStack {
} }
} }
if (updatedConfig) { if (updatedConfig) {
// Ensure the resumed state of the focus activity if we updated the confiugaration of // Ensure the resumed state of the focus activity if we updated the configuration of
// any activity. // any activity.
mStackSupervisor.resumeFocusedStackTopActivityLocked(); mStackSupervisor.resumeFocusedStackTopActivityLocked();
} }
@@ -4468,6 +4468,15 @@ final class ActivityStack {
return true; return true;
} }
// TODO: We could probably make the condition below just check that the activity state is
// stopped, but also checking the sleep state for now to reduce change impact late in
// development cycle.
if (mService.isSleepingOrShuttingDownLocked() && r.state == ActivityState.STOPPED) {
if (DEBUG_SWITCH || DEBUG_CONFIGURATION) Slog.v(TAG_CONFIGURATION,
"Skipping config check (stopped while sleeping): " + r);
return true;
}
if (DEBUG_SWITCH || DEBUG_CONFIGURATION) Slog.v(TAG_CONFIGURATION, if (DEBUG_SWITCH || DEBUG_CONFIGURATION) Slog.v(TAG_CONFIGURATION,
"Ensuring correct configuration: " + r); "Ensuring correct configuration: " + r);