Merge "Trigger role re-evaluation when package path change" into main (6ac9afe6) · Commits · e / os / android_frameworks_base

services/core/java/com/android/server/policy/role/RoleServicePlatformHelperImpl.java

+1 −13

Original line number	Diff line number	Diff line
		@@ -28,7 +28,6 @@ import android.content.Intent;
		import android.content.pm.PackageManager;
		import android.content.pm.PackageManagerInternal;
		import android.content.pm.ResolveInfo;
		import android.content.pm.Signature;
		import android.os.Environment;
		import android.permission.flags.Flags;
		import android.provider.Settings;
		@@ -312,17 +311,10 @@ public class RoleServicePlatformHelperImpl implements RoleServicePlatformHelper
		DataOutputStream dataOutputStream = new DataOutputStream(new BufferedOutputStream(mdos));
		packageManagerInternal.forEachInstalledPackage(pkg -> {
		try {
		dataOutputStream.writeUTF(pkg.getPackageName());
		dataOutputStream.writeLong(pkg.getLongVersionCode());
		dataOutputStream.writeUTF(pkg.getPath());
		dataOutputStream.writeInt(packageManagerInternal.getApplicationEnabledState(
		pkg.getPackageName(), userId));

		final Set<String> requestedPermissions = pkg.getRequestedPermissions();
		dataOutputStream.writeInt(requestedPermissions.size());
		for (String permissionName : requestedPermissions) {
		dataOutputStream.writeUTF(permissionName);
		}

		final ArraySet<String> enabledComponents =
		packageManagerInternal.getEnabledComponents(pkg.getPackageName(), userId);
		final int enabledComponentsSize = CollectionUtils.size(enabledComponents);
		@@ -337,10 +329,6 @@ public class RoleServicePlatformHelperImpl implements RoleServicePlatformHelper
		for (int i = 0; i < disabledComponentsSize; i++) {
		dataOutputStream.writeUTF(disabledComponents.valueAt(i));
		}

		for (final Signature signature : pkg.getSigningDetails().getSignatures()) {
		dataOutputStream.write(signature.toByteArray());
		}
		} catch (IOException e) {
		// Never happens for MessageDigestOutputStream and DataOutputStream.
		throw new AssertionError(e);