diff options
| author | Dianne Hackborn <hackbod@google.com> | 2013-01-09 18:31:37 -0800 |
|---|---|---|
| committer | Dianne Hackborn <hackbod@google.com> | 2013-01-09 18:51:51 -0800 |
| commit | e62fa825794967c2067be86e8b57b83f4b82ee1c (patch) | |
| tree | e61d6cd3995b98d28fb26c24becd34a267176f85 /services | |
| parent | d29f2d263af9a3017799d3098ed208a49c5ecc69 (diff) | |
| download | frameworks_base-e62fa825794967c2067be86e8b57b83f4b82ee1c.zip frameworks_base-e62fa825794967c2067be86e8b57b83f4b82ee1c.tar.gz frameworks_base-e62fa825794967c2067be86e8b57b83f4b82ee1c.tar.bz2 | |
Merge from master: fix issue #7966357: Super lights out mode vs. volume dialog
The volume panel now forces us out of the UI modes while it
is up.
Change-Id: If39fa33b1c52579bf5d376ce4722408cee3ca951
Diffstat (limited to 'services')
| -rw-r--r-- | services/java/com/android/server/am/ActivityManagerService.java | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/services/java/com/android/server/am/ActivityManagerService.java b/services/java/com/android/server/am/ActivityManagerService.java index 49dc220..1d08d31 100644 --- a/services/java/com/android/server/am/ActivityManagerService.java +++ b/services/java/com/android/server/am/ActivityManagerService.java @@ -3869,7 +3869,7 @@ public final class ActivityManagerService extends ActivityManagerNative } boolean didSomething = killPackageProcessesLocked(name, appId, userId, - -100, callerWillRestart, false, doit, evenPersistent, + -100, callerWillRestart, true, doit, evenPersistent, name == null ? ("force stop user " + userId) : ("force stop " + name)); TaskRecord lastTask = null; |