diff options
| author | Dianne Hackborn <hackbod@google.com> | 2013-01-09 19:00:06 -0800 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2013-01-09 19:00:06 -0800 |
| commit | 854458f4d52937f9a1385559d759bd8019eb3294 (patch) | |
| tree | c221ae1f7f3fe87b64b8dfc3bb397f1a71cc5de8 /services | |
| parent | d17792073fd3ab963bd5e0a7edcb312720fcea26 (diff) | |
| parent | 0287ca3ca36ad98004ddabfa189105e6324a820e (diff) | |
| download | frameworks_base-854458f4d52937f9a1385559d759bd8019eb3294.zip frameworks_base-854458f4d52937f9a1385559d759bd8019eb3294.tar.gz frameworks_base-854458f4d52937f9a1385559d759bd8019eb3294.tar.bz2 | |
am 0287ca3c: am e62fa825: Merge from master: fix issue #7966357: Super lights out mode vs. volume dialog
* commit '0287ca3ca36ad98004ddabfa189105e6324a820e':
Merge from master: fix issue #7966357: Super lights out mode vs. volume dialog
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 2ba9a10..6e81e9d 100644 --- a/services/java/com/android/server/am/ActivityManagerService.java +++ b/services/java/com/android/server/am/ActivityManagerService.java @@ -3904,7 +3904,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; |