Merge "Remove SessionParams USE_FULL_SCREEN_INTENT auto grant" (d87ae0e5) · Commits · e / os / android_frameworks_base

core/java/android/content/pm/PackageInstaller.java

+3 −55

Original line number	Diff line number	Diff line
		@@ -30,8 +30,6 @@ import static android.content.pm.PackageInfo.INSTALL_LOCATION_AUTO;
		import static android.content.pm.PackageInfo.INSTALL_LOCATION_INTERNAL_ONLY;
		import static android.content.pm.PackageInfo.INSTALL_LOCATION_PREFER_EXTERNAL;

		import static com.android.internal.util.XmlUtils.writeStringAttribute;

		import android.Manifest;
		import android.annotation.CallbackExecutor;
		import android.annotation.CurrentTimeMillisLong;
		@@ -84,7 +82,6 @@ import android.text.TextUtils;
		import android.util.ArrayMap;
		import android.util.ArraySet;
		import android.util.ExceptionUtils;
		import android.util.Log;

		import com.android.internal.content.InstallLocationUtils;
		import com.android.internal.util.ArrayUtils;
		@@ -92,7 +89,6 @@ import com.android.internal.util.DataClass;
		import com.android.internal.util.IndentingPrintWriter;
		import com.android.internal.util.Preconditions;
		import com.android.internal.util.function.pooled.PooledLambda;
		import com.android.modules.utils.TypedXmlSerializer;

		import java.io.Closeable;
		import java.io.File;
		@@ -2312,11 +2308,6 @@ public class PackageInstaller {

		private final ArrayMap<String, Integer> mPermissionStates;

		/**
		* @see #getFinalPermissionStates()
		*/
		private ArrayMap<String, Integer> mFinalPermissionStates;

		/**
		* Construct parameters for a new package install session.
		*
		@@ -2563,11 +2554,6 @@ public class PackageInstaller {
		+ (permissionName == null ? "null" : "empty"));
		}

		if (mFinalPermissionStates != null) {
		Log.wtf(TAG, "Requested permission " + permissionName + " but final permissions"
		+ " were already decided for this session: " + mFinalPermissionStates);
		}

		switch (state) {
		case PERMISSION_STATE_DEFAULT:
		mPermissionStates.remove(permissionName);
		@@ -3008,48 +2994,10 @@ public class PackageInstaller {
		}
		}

		/**
		* This is only for use by system server. If you need the actual grant state, use
		* {@link #getFinalPermissionStates()}.
		* <p/>
		* This is implemented here to avoid exposing the raw permission sets to external callers,
		* so that enforcement done in the either of the final methods is the single source of truth
		* for default grant/deny policy.
		*
		* @hide
		*/
		public void writePermissionStateXml(@NonNull TypedXmlSerializer out,
		@NonNull String grantTag, @NonNull String denyTag, @NonNull String attrName)
		throws IOException {
		for (int index = 0; index < mPermissionStates.size(); index++) {
		var permissionName = mPermissionStates.keyAt(index);
		var state = mPermissionStates.valueAt(index);
		String tag = state == PERMISSION_STATE_GRANTED ? grantTag : denyTag;
		out.startTag(null, tag);
		writeStringAttribute(out, attrName, permissionName);
		out.endTag(null, tag);
		}
		}

		/**
		* Snapshot of final permission states taken when this method is first called, to separate
		* what the caller wanted and the effective state that should be applied to the session.
		*
		* This prevents someone from adding more permissions after the fact.
		*
		* @hide
		*/
		/** @hide */
		@NonNull
		public ArrayMap<String, Integer> getFinalPermissionStates() {
		if (mFinalPermissionStates == null) {
		mFinalPermissionStates = new ArrayMap<>(mPermissionStates);
		if (!mFinalPermissionStates.containsKey(
		Manifest.permission.USE_FULL_SCREEN_INTENT)) {
		mFinalPermissionStates.put(Manifest.permission.USE_FULL_SCREEN_INTENT,
		PERMISSION_STATE_GRANTED);
		}
		}
		return mFinalPermissionStates;
		public ArrayMap<String, Integer> getPermissionStates() {
		return mPermissionStates;
		}

		/** @hide */

services/core/java/com/android/server/pm/InstallingSession.java

+1 −1

Original line number	Diff line number	Diff line
		@@ -153,7 +153,7 @@ class InstallingSession {
		mInstallSource = installSource;
		mVolumeUuid = sessionParams.volumeUuid;
		mPackageAbiOverride = sessionParams.abiOverride;
		mPermissionStates = sessionParams.getFinalPermissionStates();
		mPermissionStates = sessionParams.getPermissionStates();
		mAllowlistedRestrictedPermissions = sessionParams.whitelistedRestrictedPermissions;
		mAutoRevokePermissionsMode = sessionParams.autoRevokePermissionsMode;
		mSigningDetails = signingDetails;

services/core/java/com/android/server/pm/PackageInstallerService.java

+1 −1

Original line number	Diff line number	Diff line
		@@ -804,7 +804,7 @@ public class PackageInstallerService extends IPackageInstaller.Stub implements
		+ " PackageManager.INSTALL_GRANT_ALL_REQUESTED_PERMISSIONS flag");
		}

		var permissionStates = params.getFinalPermissionStates();
		var permissionStates = params.getPermissionStates();
		if (!permissionStates.isEmpty()) {
		if (!hasInstallGrantRuntimePermissions) {
		for (int index = 0; index < permissionStates.size(); index++) {

services/core/java/com/android/server/pm/PackageInstallerSession.java

+10 −1

Original line number	Diff line number	Diff line
		@@ -4878,7 +4878,16 @@ public class PackageInstallerSession extends IPackageInstallerSession.Stub {

		private static void writePermissionsLocked(@NonNull TypedXmlSerializer out,
		@NonNull SessionParams params) throws IOException {
		params.writePermissionStateXml(out, TAG_GRANT_PERMISSION, TAG_DENY_PERMISSION, ATTR_NAME);
		var permissionStates = params.getPermissionStates();
		for (int index = 0; index < permissionStates.size(); index++) {
		var permissionName = permissionStates.keyAt(index);
		var state = permissionStates.valueAt(index);
		String tag = state == SessionParams.PERMISSION_STATE_GRANTED ? TAG_GRANT_PERMISSION
		: TAG_DENY_PERMISSION;
		out.startTag(null, tag);
		writeStringAttribute(out, ATTR_NAME, permissionName);
		out.endTag(null, tag);
		}
		}

		private static void writeWhitelistedRestrictedPermissionsLocked(@NonNull TypedXmlSerializer out,

services/tests/PackageManagerServiceTests/server/src/com/android/server/pm/PackageInstallerSessionTest.kt

+2 −5

Original line number	Diff line number	Diff line
		@@ -15,7 +15,6 @@
		*/
		package com.android.server.pm

		import android.Manifest
		import android.content.Context
		import android.content.pm.PackageInstaller
		import android.content.pm.PackageInstaller.SessionParams
		@@ -122,12 +121,10 @@ class PackageInstallerSessionTest {
		writeRestoreAssert(sessions).single().params.run {
		assertThat(legacyGrantedRuntimePermissions).asList()
		.containsExactly("grantPermission", "denyToGrantPermission")
		assertThat(finalPermissionStates)
		assertThat(permissionStates)
		.containsExactlyEntriesIn(mapOf(
		"grantPermission" to PERMISSION_STATE_GRANTED,
		"denyToGrantPermission" to PERMISSION_STATE_GRANTED,
		// Fullscreen Intent is auto-granted if the caller has no opinion
		Manifest.permission.USE_FULL_SCREEN_INTENT to PERMISSION_STATE_GRANTED,
		"denyPermission" to PERMISSION_STATE_DENIED,
		"grantToDenyPermission" to PERMISSION_STATE_DENIED,
		))
		@@ -282,7 +279,7 @@ class PackageInstallerSessionTest {
		assertThat(expected.referrerUri).isEqualTo(actual.referrerUri)
		assertThat(expected.abiOverride).isEqualTo(actual.abiOverride)
		assertThat(expected.volumeUuid).isEqualTo(actual.volumeUuid)
		assertThat(expected.finalPermissionStates).isEqualTo(actual.finalPermissionStates)
		assertThat(expected.permissionStates).isEqualTo(actual.permissionStates)
		assertThat(expected.installerPackageName).isEqualTo(actual.installerPackageName)
		assertThat(expected.isMultiPackage).isEqualTo(actual.isMultiPackage)
		assertThat(expected.isStaged).isEqualTo(actual.isStaged)