Merge "DO NOT MERGE - Kill apps outright for API contract violations" into qt-qpr1-dev (19cffe42) · Commits · e / os / android_frameworks_base

core/java/android/app/IActivityManager.aidl

+2 −1

Original line number	Original line	Diff line number	Diff line
	@@ -287,7 +287,8 @@ interface IActivityManager {
	void handleApplicationStrictModeViolation(in IBinder app, int penaltyMask,		void handleApplicationStrictModeViolation(in IBinder app, int penaltyMask,
	in StrictMode.ViolationInfo crashInfo);		in StrictMode.ViolationInfo crashInfo);
	boolean isTopActivityImmersive();		boolean isTopActivityImmersive();
	void crashApplication(int uid, int initialPid, in String packageName, int userId, in String message);		void crashApplication(int uid, int initialPid, in String packageName, int userId,
			in String message, boolean force);
	@UnsupportedAppUsage		@UnsupportedAppUsage
	String getProviderMimeType(in Uri uri, int userId);		String getProviderMimeType(in Uri uri, int userId);
	// Cause the specified process to dump the specified heap.		// Cause the specified process to dump the specified heap.

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

+10 −1

Original line number	Original line	Diff line number	Diff line
	@@ -829,6 +829,15 @@ public final class ActiveServices {
	}		}
	}		}

			void killMisbehavingService(ServiceRecord r,
			int appUid, int appPid, String localPackageName) {
			synchronized (mAm) {
			stopServiceLocked(r);
			mAm.crashApplication(appUid, appPid, localPackageName, -1,
			"Bad notification for startForeground", true /force/);
			}
			}

	IBinder peekServiceLocked(Intent service, String resolvedType, String callingPackage) {		IBinder peekServiceLocked(Intent service, String resolvedType, String callingPackage) {
	ServiceLookupResult r = retrieveServiceLocked(service, null, resolvedType, callingPackage,		ServiceLookupResult r = retrieveServiceLocked(service, null, resolvedType, callingPackage,
	Binder.getCallingPid(), Binder.getCallingUid(),		Binder.getCallingPid(), Binder.getCallingUid(),
	@@ -3918,7 +3927,7 @@ public final class ActiveServices {
	void serviceForegroundCrash(ProcessRecord app, CharSequence serviceRecord) {		void serviceForegroundCrash(ProcessRecord app, CharSequence serviceRecord) {
	mAm.crashApplication(app.uid, app.pid, app.info.packageName, app.userId,		mAm.crashApplication(app.uid, app.pid, app.info.packageName, app.userId,
	"Context.startForegroundService() did not then call Service.startForeground(): "		"Context.startForegroundService() did not then call Service.startForeground(): "
	+ serviceRecord);		+ serviceRecord, false /force/);
	}		}

	void scheduleServiceTimeoutLocked(ProcessRecord proc) {		void scheduleServiceTimeoutLocked(ProcessRecord proc) {

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

+3 −2

Original line number	Original line	Diff line number	Diff line
	@@ -3568,7 +3568,7 @@ public class ActivityManagerService extends IActivityManager.Stub

	@Override		@Override
	public void crashApplication(int uid, int initialPid, String packageName, int userId,		public void crashApplication(int uid, int initialPid, String packageName, int userId,
	String message) {		String message, boolean force) {
	if (checkCallingPermission(android.Manifest.permission.FORCE_STOP_PACKAGES)		if (checkCallingPermission(android.Manifest.permission.FORCE_STOP_PACKAGES)
	!= PackageManager.PERMISSION_GRANTED) {		!= PackageManager.PERMISSION_GRANTED) {
	String msg = "Permission Denial: crashApplication() from pid="		String msg = "Permission Denial: crashApplication() from pid="
	@@ -3580,7 +3580,8 @@ public class ActivityManagerService extends IActivityManager.Stub
	}		}

	synchronized(this) {		synchronized(this) {
	mAppErrors.scheduleAppCrashLocked(uid, initialPid, packageName, userId, message);		mAppErrors.scheduleAppCrashLocked(uid, initialPid, packageName, userId,
			message, force);
	}		}
	}		}

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

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -1051,7 +1051,7 @@ final class ActivityManagerShellCommand extends ShellCommand {
	} catch (NumberFormatException e) {		} catch (NumberFormatException e) {
	packageName = arg;		packageName = arg;
	}		}
	mInterface.crashApplication(-1, pid, packageName, userId, "shell-induced crash");		mInterface.crashApplication(-1, pid, packageName, userId, "shell-induced crash", false);
	return 0;		return 0;
	}		}

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

+19 −7

Original line number	Original line	Diff line number	Diff line
	@@ -314,20 +314,24 @@ class AppErrors {
	}		}

	void killAppAtUserRequestLocked(ProcessRecord app, Dialog fromDialog) {		void killAppAtUserRequestLocked(ProcessRecord app, Dialog fromDialog) {
	app.setCrashing(false);
	app.crashingReport = null;
	app.setNotResponding(false);
	app.notRespondingReport = null;
	if (app.anrDialog == fromDialog) {		if (app.anrDialog == fromDialog) {
	app.anrDialog = null;		app.anrDialog = null;
	}		}
	if (app.waitDialog == fromDialog) {		if (app.waitDialog == fromDialog) {
	app.waitDialog = null;		app.waitDialog = null;
	}		}
			killAppImmediateLocked(app, "user-terminated", "user request after error");
			}

			private void killAppImmediateLocked(ProcessRecord app, String reason, String killReason) {
			app.setCrashing(false);
			app.crashingReport = null;
			app.setNotResponding(false);
			app.notRespondingReport = null;
	if (app.pid > 0 && app.pid != MY_PID) {		if (app.pid > 0 && app.pid != MY_PID) {
	handleAppCrashLocked(app, "user-terminated" /reason/,		handleAppCrashLocked(app, reason,
	null /shortMsg/, null /longMsg/, null /stackTrace/, null /data/);		null /shortMsg/, null /longMsg/, null /stackTrace/, null /data/);
	app.kill("user request after error", true);		app.kill(killReason, true);
	}		}
	}		}

	@@ -341,7 +345,7 @@ class AppErrors {
	* @param message		* @param message
	*/		*/
	void scheduleAppCrashLocked(int uid, int initialPid, String packageName, int userId,		void scheduleAppCrashLocked(int uid, int initialPid, String packageName, int userId,
	String message) {		String message, boolean force) {
	ProcessRecord proc = null;		ProcessRecord proc = null;

	// Figure out which process to kill. We don't trust that initialPid		// Figure out which process to kill. We don't trust that initialPid
	@@ -374,6 +378,14 @@ class AppErrors {
	}		}

	proc.scheduleCrash(message);		proc.scheduleCrash(message);
			if (force) {
			// If the app is responsive, the scheduled crash will happen as expected
			// and then the delayed summary kill will be a no-op.
			final ProcessRecord p = proc;
			mService.mHandler.postDelayed(
			() -> killAppImmediateLocked(p, "forced", "killed for invalid state"),
			5000L);
			}
	}		}

	/**		/**