am 3d004830: am 2c082ae3: am 90e9b1d3: Fix issue #11790471: Crash removed home... (139156f4) · Commits · e / os / android_frameworks_base

services/java/com/android/server/am/ActiveServices.java

+5 −3

Original line number	Diff line number	Diff line
		@@ -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,8 +1930,10 @@ public final class ActiveServices {
		Slog.i(TAG, " Force stopping service " + service);
		if (service.app != null) {
		service.app.removed = true;
		if (!service.app.persistent) {
		service.app.services.remove(service);
		}
		}
		service.app = null;
		service.isolatedProc = null;
		result.add(service);
		@@ -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;