diff options
| author | Dianne Hackborn <hackbod@google.com> | 2013-01-09 19:01:26 -0800 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2013-01-09 19:01:26 -0800 |
| commit | 9e6575bc52f421484fe262aff224db247e70d830 (patch) | |
| tree | 71536052f31d3020f54557ca794cc3c55455889c /services | |
| parent | 79cc4a2ab0130acca83de5945a43adf9925beac1 (diff) | |
| parent | 854458f4d52937f9a1385559d759bd8019eb3294 (diff) | |
| download | frameworks_base-9e6575bc52f421484fe262aff224db247e70d830.zip frameworks_base-9e6575bc52f421484fe262aff224db247e70d830.tar.gz frameworks_base-9e6575bc52f421484fe262aff224db247e70d830.tar.bz2 | |
am 854458f4: am 0287ca3c: am e62fa825: Merge from master: fix issue #7966357: Super lights out mode vs. volume dialog
* commit '854458f4d52937f9a1385559d759bd8019eb3294':
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; |