Apply Android auto patch (b8d46440) · Commits · e / os / android_frameworks_base

core/java/android/content/pm/PackageParser.java

+34 −0

Original line number	Diff line number	Diff line
		@@ -6567,6 +6567,40 @@ public class PackageParser {
		return false;
		}


		/**
		* Return the Cerificate's Digest
		*/
		public @Nullable String getSha256Certificate() {
		return getSha256CertificateInternal();
		}

		private @Nullable String getSha256CertificateInternal() {
		String digest;
		if (this == UNKNOWN) {
		return null;
		}
		if (hasPastSigningCertificates()) {

		// check all past certs, except for the last one, which automatically gets all
		// capabilities, since it is the same as the current signature, and is checked below
		for (int i = 0; i < pastSigningCertificates.length - 1; i++) {
		digest = PackageUtils.computeSha256Digest(
		pastSigningCertificates[i].toByteArray());
		return digest;
		}
		}

		// not in previous certs signing history, just check the current signer
		if (signatures.length == 1) {
		digest =
		PackageUtils.computeSha256Digest(signatures[0].toByteArray());
		return digest;
		}
		return null;
		}


		/** Returns true if the signatures in this and other match exactly. */
		public boolean signaturesMatchExactly(SigningDetails other) {
		return Signature.areExactMatch(this.signatures, other.signatures);

services/core/java/com/android/server/pm/permission/PermissionManagerService.java

+14 −0

Original line number	Diff line number	Diff line
		@@ -328,6 +328,11 @@ public class PermissionManagerService extends IPermissionManager.Stub {
		@Nullable
		private HotwordDetectionServiceProvider mHotwordDetectionServiceProvider;

		// Define allowed permissions for Android Auto
		private ArrayList<String> androidAutoPerms = new ArrayList<String>(
		Arrays.asList("android.permission.MODIFY_AUDIO_ROUTING", "android.permission.REAL_GET_TASKS", "android.permission.LOCAL_MAC_ADDRESS", "android.permission.MANAGE_USB", "android.permission.MANAGE_USERS", "android.permission.BLUETOOTH_PRIVILEGED", "android.permission.TOGGLE_AUTOMOTIVE_PROJECTION", "android.permission.READ_PHONE_NUMBERS"));
		private static final String GOOGLEAUTOHASH = "FDB00C43DBDE8B51CB312AA81D3B5FA17713ADB94B28F598D77F8EB89DACEEDF";

		// TODO: Take a look at the methods defined in the callback.
		// The callback was initially created to support the split between permission
		// manager and the package manager. However, it's started to be used for other
		@@ -985,6 +990,15 @@ public class PermissionManagerService extends IPermissionManager.Stub {
		return PackageManager.PERMISSION_DENIED;
		}

		if (pkg.getPackageName() == "com.google.android.projection.gearhead") {
		String hash = pkg.getSigningDetails().getSha256Certificate();
		if(hash.equals(GOOGLEAUTOHASH)) {
		if (androidAutoPerms.contains(permissionName)) {
		return PackageManager.PERMISSION_GRANTED;
		}
		}
		}

		if (checkSinglePermissionInternalLocked(uidState, permissionName, isInstantApp)) {
		return PackageManager.PERMISSION_GRANTED;
		}