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

am 2c082ae3: am 90e9b1d3: Fix issue #11790471: Crash removed home buttons and notification bar/shade

Browse Source 
* commit '2c082ae3d209aa590c1839d75436f7aa77b37125':
  Fix issue #11790471: Crash removed home buttons and notification bar/shade
This commit is contained in:
Dianne Hackborn
2013-11-21 14:14:12 -08:00
committed by Android Git Automerger
parent 4f23b6104e 2c082ae3d2
commit 3d00483045
1 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
services/java/com/android/server/am/ActiveServices.java
View File

@@ -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;