diff options
| author | Dianne Hackborn <hackbod@google.com> | 2013-11-21 14:14:12 -0800 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2013-11-21 14:14:12 -0800 |
| commit | 3d0048304590a61cf32902440a3fcc27d0281f89 (patch) | |
| tree | 572efc0bb34d1a93db85f3b0e7ff1d98ec6795e2 /services/java | |
| parent | 4f23b6104e11be81f3e2ca1a1031de6ca112f50a (diff) | |
| parent | 2c082ae3d209aa590c1839d75436f7aa77b37125 (diff) | |
| download | frameworks_base-3d0048304590a61cf32902440a3fcc27d0281f89.zip frameworks_base-3d0048304590a61cf32902440a3fcc27d0281f89.tar.gz frameworks_base-3d0048304590a61cf32902440a3fcc27d0281f89.tar.bz2 | |
am 2c082ae3: am 90e9b1d3: Fix issue #11790471: Crash removed home buttons and notification bar/shade
* commit '2c082ae3d209aa590c1839d75436f7aa77b37125':
Fix issue #11790471: Crash removed home buttons and notification bar/shade
Diffstat (limited to 'services/java')
| -rw-r--r-- | services/java/com/android/server/am/ActiveServices.java | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/services/java/com/android/server/am/ActiveServices.java b/services/java/com/android/server/am/ActiveServices.java index 933247e..89bddc6 100644 --- a/services/java/com/android/server/am/ActiveServices.java +++ b/services/java/com/android/server/am/ActiveServices.java @@ -1847,7 +1847,7 @@ public final class ActiveServices { } } if (finishing) { - if (r.app != null) { + if (r.app != null && !r.app.persistent) { r.app.services.remove(r); } r.app = null; @@ -1930,7 +1930,9 @@ public final class ActiveServices { Slog.i(TAG, " Force stopping service " + service); if (service.app != null) { service.app.removed = true; - service.app.services.remove(service); + if (!service.app.persistent) { + service.app.services.remove(service); + } } service.app = null; service.isolatedProc = null; @@ -2032,7 +2034,7 @@ public final class ActiveServices { synchronized (sr.stats.getBatteryStats()) { sr.stats.stopLaunchedLocked(); } - if (sr.app != null) { + if (sr.app != null && !sr.app.persistent) { sr.app.services.remove(sr); } sr.app = null; |