Merge "Always kill app when M_E_S is denied" into rvc-dev (d7e1e468) · Commits · e / os / android_frameworks_base

services/core/java/com/android/server/StorageManagerService.java

+3 −8

Original line number	Diff line number	Diff line
		@@ -4736,7 +4736,7 @@ class StorageManagerService extends IStorageManager.Stub
		return true;
		}

		private void killAppForOpChange(int code, int uid, String packageName) {
		private void killAppForOpChange(int code, int uid) {
		final IActivityManager am = ActivityManager.getService();
		try {
		am.killUid(UserHandle.getAppId(uid), UserHandle.USER_ALL,
		@@ -4753,7 +4753,7 @@ class StorageManagerService extends IStorageManager.Stub
		switch(code) {
		case OP_REQUEST_INSTALL_PACKAGES:
		// Always kill regardless of op change, to remount apps /storage
		killAppForOpChange(code, uid, packageName);
		killAppForOpChange(code, uid);
		return;
		case OP_MANAGE_EXTERNAL_STORAGE:
		if (mode != MODE_ALLOWED) {
		@@ -4762,12 +4762,7 @@ class StorageManagerService extends IStorageManager.Stub
		// results in a bad UX, especially since the gid only gives access
		// to unreliable volumes, USB OTGs that are rarely mounted. The app
		// will get the external_storage gid on next organic restart.
		if (packageName != null) {
		killAppForOpChange(code, uid, packageName);
		} else {
		// TODO(b/158283222) this can happen, figure out if we need
		// to kill in this case as well.
		}
		killAppForOpChange(code, uid);
		}
		return;
		case OP_LEGACY_STORAGE: