Merge "Work on issue #36427964: SecurityException: Unable to find app..." into oc-dev (bea817a7) · Commits · e / os / android_frameworks_base

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

+19 −24

Original line number	Diff line number	Diff line
		@@ -324,7 +324,7 @@ public final class ActiveServices {
		if (callerApp == null) {
		throw new SecurityException(
		"Unable to find app for caller " + caller
		+ " (pid=" + Binder.getCallingPid()
		+ " (pid=" + callingPid
		+ ") when starting service " + service);
		}
		callerFg = callerApp.setSchedGroup != ProcessList.SCHED_GROUP_BACKGROUND;
		@@ -353,8 +353,6 @@ public final class ActiveServices {
		// If this isn't a direct-to-foreground start, check our ability to kick off an
		// arbitrary service
		if (!r.startRequested && !fgRequired) {
		final long token = Binder.clearCallingIdentity();
		try {
		// Before going further -- if this app is not allowed to start services in the
		// background, then at this point we aren't going to let it period.
		final int allowed = mAm.getAppStartModeLocked(r.appInfo.uid, r.packageName,
		@@ -374,9 +372,6 @@ public final class ActiveServices {
		UidRecord uidRec = mAm.mActiveUids.get(r.appInfo.uid);
		return new ComponentName("?", "app is in background uid " + uidRec);
		}
		} finally {
		Binder.restoreCallingIdentity(token);
		}
		}

		NeededUriGrants neededGrants = mAm.checkGrantUriPermissionFromIntentLocked(

services/core/java/com/android/server/am/ActivityManagerService.java

+38 −10

Original line number	Diff line number	Diff line
		@@ -5243,10 +5243,10 @@ public class ActivityManagerService extends IActivityManager.Stub
		}

		private final int getLRURecordIndexForAppLocked(IApplicationThread thread) {
		IBinder threadBinder = thread.asBinder();
		final IBinder threadBinder = thread.asBinder();
		// Find the application record.
		for (int i=mLruProcesses.size()-1; i>=0; i--) {
		ProcessRecord rec = mLruProcesses.get(i);
		final ProcessRecord rec = mLruProcesses.get(i);
		if (rec.thread != null && rec.thread.asBinder() == threadBinder) {
		return i;
		}
		@@ -5261,7 +5261,27 @@ public class ActivityManagerService extends IActivityManager.Stub
		}

		int appIndex = getLRURecordIndexForAppLocked(thread);
		return appIndex >= 0 ? mLruProcesses.get(appIndex) : null;
		if (appIndex >= 0) {
		return mLruProcesses.get(appIndex);
		}

		// Validation: if it isn't in the LRU list, it shouldn't exist, but let's
		// double-check that.
		final IBinder threadBinder = thread.asBinder();
		final ArrayMap<String, SparseArray<ProcessRecord>> pmap = mProcessNames.getMap();
		for (int i = pmap.size()-1; i >= 0; i--) {
		final SparseArray<ProcessRecord> procs = pmap.valueAt(i);
		for (int j = procs.size()-1; j >= 0; j--) {
		final ProcessRecord proc = procs.valueAt(j);
		if (proc.thread != null && proc.thread.asBinder() == threadBinder) {
		Slog.wtf(TAG, "getRecordForApp: exists in name list but not in LRU list: "
		+ proc);
		return proc;
		}
		}
		}

		return null;
		}

		final void doLowMemReportIfNeededLocked(ProcessRecord dyingProc) {
		@@ -17874,10 +17894,14 @@ public class ActivityManagerService extends IActivityManager.Stub
		final int callingPid = Binder.getCallingPid();
		final int callingUid = Binder.getCallingUid();
		final long origId = Binder.clearCallingIdentity();
		ComponentName res = mServices.startServiceLocked(caller, service,
		ComponentName res;
		try {
		res = mServices.startServiceLocked(caller, service,
		resolvedType, id, notification, callingPid, callingUid,
		requireForeground, callingPackage, userId);
		} finally {
		Binder.restoreCallingIdentity(origId);
		}
		return res;
		}
		}
		@@ -17889,9 +17913,13 @@ public class ActivityManagerService extends IActivityManager.Stub
		if (DEBUG_SERVICE) Slog.v(TAG_SERVICE,
		"startServiceInPackage: " + service + " type=" + resolvedType);
		final long origId = Binder.clearCallingIdentity();
		ComponentName res = mServices.startServiceLocked(null, service,
		ComponentName res;
		try {
		res = mServices.startServiceLocked(null, service,
		resolvedType, 0, null, -1, uid, fgRequired, callingPackage, userId);
		} finally {
		Binder.restoreCallingIdentity(origId);
		}
		return res;
		}
		}