Merge "Fix crash:" (ee221984) · Commits · e / os / android_frameworks_base

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

+2 −3

Original line number	Original line	Diff line number	Diff line
	@@ -2071,16 +2071,15 @@ public final class ActiveServices {
	// Unless the process is persistent, this process record is going away,		// Unless the process is persistent, this process record is going away,
	// so make sure the service is cleaned out of it.		// so make sure the service is cleaned out of it.
	if (!app.persistent) {		if (!app.persistent) {
	app.services.remove(sr);		app.services.removeAt(i);
	}		}

	// Sanity check: if the service listed for the app is not one		// Sanity check: if the service listed for the app is not one
	// we actually are maintaining, drop it.		// we actually are maintaining, just let it drop.
	if (smap.mServicesByName.get(sr.name) != sr) {		if (smap.mServicesByName.get(sr.name) != sr) {
	ServiceRecord cur = smap.mServicesByName.get(sr.name);		ServiceRecord cur = smap.mServicesByName.get(sr.name);
	Slog.wtf(TAG, "Service " + sr + " in process " + app		Slog.wtf(TAG, "Service " + sr + " in process " + app
	+ " not same as in map: " + cur);		+ " not same as in map: " + cur);
	app.services.removeAt(i);
	continue;		continue;
	}		}