Merge "Remove mountExtStorageFull" (fa0e9b63) · Commits · e / os / android_frameworks_base

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

+6 −14

Original line number	Diff line number	Diff line
		@@ -6003,23 +6003,21 @@ public class ActivityManagerService extends IActivityManager.Stub
		final ProcessRecord addAppLocked(ApplicationInfo info, String customProcess, boolean isolated,
		String abiOverride, int zygotePolicyFlags) {
		return addAppLocked(info, customProcess, isolated, false /* disableHiddenApiChecks */,
		false /* mountExtStorageFull */, abiOverride, zygotePolicyFlags);
		abiOverride, zygotePolicyFlags);
		}

		@GuardedBy("this")
		final ProcessRecord addAppLocked(ApplicationInfo info, String customProcess, boolean isolated,
		boolean disableHiddenApiChecks, boolean mountExtStorageFull, String abiOverride,
		int zygotePolicyFlags) {
		boolean disableHiddenApiChecks, String abiOverride, int zygotePolicyFlags) {
		return addAppLocked(info, customProcess, isolated, disableHiddenApiChecks,
		false /* disableTestApiChecks */, mountExtStorageFull, abiOverride,
		zygotePolicyFlags);
		false /* disableTestApiChecks */, abiOverride, zygotePolicyFlags);
		}

		// TODO: Move to ProcessList?
		@GuardedBy("this")
		final ProcessRecord addAppLocked(ApplicationInfo info, String customProcess, boolean isolated,
		boolean disableHiddenApiChecks, boolean disableTestApiChecks,
		boolean mountExtStorageFull, String abiOverride, int zygotePolicyFlags) {
		String abiOverride, int zygotePolicyFlags) {
		ProcessRecord app;
		if (!isolated) {
		app = getProcessRecordLocked(customProcess != null ? customProcess : info.processName,
		@@ -6054,8 +6052,7 @@ public class ActivityManagerService extends IActivityManager.Stub
		mPersistentStartingProcesses.add(app);
		mProcessList.startProcessLocked(app, new HostingRecord("added application",
		customProcess != null ? customProcess : app.processName),
		zygotePolicyFlags, disableHiddenApiChecks, disableTestApiChecks,
		mountExtStorageFull, abiOverride);
		zygotePolicyFlags, disableHiddenApiChecks, disableTestApiChecks, abiOverride);
		}

		return app;
		@@ -14356,10 +14353,6 @@ public class ActivityManagerService extends IActivityManager.Stub
		"disable hidden API checks");
		}

		// TODO(b/158750470): remove
		final boolean mountExtStorageFull = isCallerShell()
		&& (flags & INSTR_FLAG_DISABLE_ISOLATED_STORAGE) != 0;

		final long origId = Binder.clearCallingIdentity();

		ProcessRecord app;
		@@ -14375,8 +14368,7 @@ public class ActivityManagerService extends IActivityManager.Stub
		UsageEvents.Event.SYSTEM_INTERACTION);
		}
		app = addAppLocked(ai, defProcess, false, disableHiddenApiChecks,
		disableTestApiChecks, mountExtStorageFull, abiOverride,
		ZYGOTE_POLICY_FLAG_EMPTY);
		disableTestApiChecks, abiOverride, ZYGOTE_POLICY_FLAG_EMPTY);
		}

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

+2 −2

Original line number	Diff line number	Diff line
		@@ -1737,7 +1737,7 @@ public final class ProcessList {
		@GuardedBy("mService")
		boolean startProcessLocked(ProcessRecord app, HostingRecord hostingRecord,
		int zygotePolicyFlags, boolean disableHiddenApiChecks, boolean disableTestApiChecks,
		boolean mountExtStorageFull, String abiOverride) {
		String abiOverride) {
		if (app.pendingStart) {
		return true;
		}
		@@ -2331,7 +2331,7 @@ public final class ProcessList {
		int zygotePolicyFlags, String abiOverride) {
		return startProcessLocked(app, hostingRecord, zygotePolicyFlags,
		false /* disableHiddenApiChecks /, false / disableTestApiChecks */,
		false /* mountExtStorageFull */, abiOverride);
		abiOverride);
		}

		@GuardedBy("mService")