Merge "Revert "Include an AppOp to allow dialer role app to record and play... (10e46cc4) · Commits · e / os / android_frameworks_base

api/current.txt

+0 −1

Original line number	Diff line number	Diff line
		@@ -9,7 +9,6 @@ package android {
		ctor public Manifest.permission();
		field public static final String ACCEPT_HANDOVER = "android.permission.ACCEPT_HANDOVER";
		field public static final String ACCESS_BACKGROUND_LOCATION = "android.permission.ACCESS_BACKGROUND_LOCATION";
		field public static final String ACCESS_CALL_AUDIO = "android.permission.ACCESS_CALL_AUDIO";
		field public static final String ACCESS_CHECKIN_PROPERTIES = "android.permission.ACCESS_CHECKIN_PROPERTIES";
		field public static final String ACCESS_COARSE_LOCATION = "android.permission.ACCESS_COARSE_LOCATION";
		field public static final String ACCESS_FINE_LOCATION = "android.permission.ACCESS_FINE_LOCATION";

api/system-current.txt

+0 −1

Original line number	Diff line number	Diff line
		@@ -368,7 +368,6 @@ package android.app {
		method @RequiresPermission("android.permission.MANAGE_APP_OPS_MODES") public void setUidMode(@NonNull String, int, int);
		field public static final String OPSTR_ACCEPT_HANDOVER = "android:accept_handover";
		field public static final String OPSTR_ACCESS_ACCESSIBILITY = "android:access_accessibility";
		field public static final String OPSTR_ACCESS_CALL_AUDIO = "android:access_call_audio";
		field public static final String OPSTR_ACCESS_NOTIFICATIONS = "android:access_notifications";
		field public static final String OPSTR_ACTIVATE_VPN = "android:activate_vpn";
		field public static final String OPSTR_ASSIST_SCREENSHOT = "android:assist_screenshot";

core/java/android/app/AppOpsManager.java

+11 −14

Original line number	Diff line number	Diff line
		@@ -1088,8 +1088,9 @@ public class AppOpsManager {
		public static final int OP_ACTIVATE_PLATFORM_VPN = AppProtoEnums.APP_OP_ACTIVATE_PLATFORM_VPN;
		/** @hide */
		public static final int OP_LOADER_USAGE_STATS = AppProtoEnums.APP_OP_LOADER_USAGE_STATS;
		/** @hide Access telephony call audio */
		public static final int OP_ACCESS_CALL_AUDIO = AppProtoEnums.APP_OP_ACCESS_CALL_AUDIO;

		// App op deprecated/removed.
		private static final int OP_DEPRECATED_1 = AppProtoEnums.APP_OP_DEPRECATED_1;

		/** @hide Auto-revoke app permissions if app is unused for an extended period */
		public static final int OP_AUTO_REVOKE_PERMISSIONS_IF_UNUSED =
		@@ -1396,9 +1397,6 @@ public class AppOpsManager {
		@SystemApi
		public static final String OPSTR_MANAGE_EXTERNAL_STORAGE =
		"android:manage_external_storage";
		/** @hide Access telephony call audio */
		@SystemApi
		public static final String OPSTR_ACCESS_CALL_AUDIO = "android:access_call_audio";

		/** @hide Auto-revoke app permissions if app is unused for an extended period */
		@SystemApi
		@@ -1498,7 +1496,6 @@ public class AppOpsManager {
		OP_MANAGE_EXTERNAL_STORAGE,
		OP_INTERACT_ACROSS_PROFILES,
		OP_LOADER_USAGE_STATS,
		OP_ACCESS_CALL_AUDIO,
		OP_AUTO_REVOKE_PERMISSIONS_IF_UNUSED,
		OP_AUTO_REVOKE_MANAGED_BY_INSTALLER,
		};
		@@ -1608,7 +1605,7 @@ public class AppOpsManager {
		OP_INTERACT_ACROSS_PROFILES, //INTERACT_ACROSS_PROFILES
		OP_ACTIVATE_PLATFORM_VPN, // ACTIVATE_PLATFORM_VPN
		OP_LOADER_USAGE_STATS, // LOADER_USAGE_STATS
		OP_ACCESS_CALL_AUDIO, // ACCESS_CALL_AUDIO
		OP_DEPRECATED_1, // deprecated
		OP_AUTO_REVOKE_PERMISSIONS_IF_UNUSED, //AUTO_REVOKE_PERMISSIONS_IF_UNUSED
		OP_AUTO_REVOKE_MANAGED_BY_INSTALLER, //OP_AUTO_REVOKE_MANAGED_BY_INSTALLER
		};
		@@ -1713,7 +1710,7 @@ public class AppOpsManager {
		OPSTR_INTERACT_ACROSS_PROFILES,
		OPSTR_ACTIVATE_PLATFORM_VPN,
		OPSTR_LOADER_USAGE_STATS,
		OPSTR_ACCESS_CALL_AUDIO,
		"", // deprecated
		OPSTR_AUTO_REVOKE_PERMISSIONS_IF_UNUSED,
		OPSTR_AUTO_REVOKE_MANAGED_BY_INSTALLER,
		};
		@@ -1819,7 +1816,7 @@ public class AppOpsManager {
		"INTERACT_ACROSS_PROFILES",
		"ACTIVATE_PLATFORM_VPN",
		"LOADER_USAGE_STATS",
		"ACCESS_CALL_AUDIO",
		"deprecated",
		"AUTO_REVOKE_PERMISSIONS_IF_UNUSED",
		"AUTO_REVOKE_MANAGED_BY_INSTALLER",
		};
		@@ -1926,7 +1923,7 @@ public class AppOpsManager {
		android.Manifest.permission.INTERACT_ACROSS_PROFILES,
		null, // no permission for OP_ACTIVATE_PLATFORM_VPN
		android.Manifest.permission.LOADER_USAGE_STATS,
		Manifest.permission.ACCESS_CALL_AUDIO,
		null, // deprecated operation
		null, // no permission for OP_AUTO_REVOKE_PERMISSIONS_IF_UNUSED
		null, // no permission for OP_AUTO_REVOKE_MANAGED_BY_INSTALLER
		};
		@@ -2033,7 +2030,7 @@ public class AppOpsManager {
		null, // INTERACT_ACROSS_PROFILES
		null, // ACTIVATE_PLATFORM_VPN
		null, // LOADER_USAGE_STATS
		null, // ACCESS_CALL_AUDIO
		null, // deprecated operation
		null, // AUTO_REVOKE_PERMISSIONS_IF_UNUSED
		null, // AUTO_REVOKE_MANAGED_BY_INSTALLER
		};
		@@ -2139,7 +2136,7 @@ public class AppOpsManager {
		null, // INTERACT_ACROSS_PROFILES
		null, // ACTIVATE_PLATFORM_VPN
		null, // LOADER_USAGE_STATS
		null, // ACCESS_CALL_AUDIO
		null, // deprecated operation
		null, // AUTO_REVOKE_PERMISSIONS_IF_UNUSED
		null, // AUTO_REVOKE_MANAGED_BY_INSTALLER
		};
		@@ -2244,7 +2241,7 @@ public class AppOpsManager {
		AppOpsManager.MODE_DEFAULT, // INTERACT_ACROSS_PROFILES
		AppOpsManager.MODE_IGNORED, // ACTIVATE_PLATFORM_VPN
		AppOpsManager.MODE_DEFAULT, // LOADER_USAGE_STATS
		AppOpsManager.MODE_DEFAULT, // ACCESS_CALL_AUDIO
		AppOpsManager.MODE_IGNORED, // deprecated operation
		AppOpsManager.MODE_DEFAULT, // OP_AUTO_REVOKE_PERMISSIONS_IF_UNUSED
		AppOpsManager.MODE_ALLOWED, // OP_AUTO_REVOKE_MANAGED_BY_INSTALLER
		};
		@@ -2353,7 +2350,7 @@ public class AppOpsManager {
		false, // INTERACT_ACROSS_PROFILES
		false, // ACTIVATE_PLATFORM_VPN
		false, // LOADER_USAGE_STATS
		false, // ACCESS_CALL_AUDIO
		false, // deprecated operation
		false, // AUTO_REVOKE_PERMISSIONS_IF_UNUSED
		false, // AUTO_REVOKE_MANAGED_BY_INSTALLER
		};

core/proto/android/app/enums.proto

+1 −3

Original line number	Diff line number	Diff line
		@@ -203,9 +203,7 @@ enum AppOpEnum {
		APP_OP_INTERACT_ACROSS_PROFILES = 93;
		APP_OP_ACTIVATE_PLATFORM_VPN = 94;
		APP_OP_LOADER_USAGE_STATS = 95;
		APP_OP_ACCESS_CALL_AUDIO = 96;
		APP_OP_DEPRECATED_1 = 96 [deprecated = true];
		APP_OP_AUTO_REVOKE_PERMISSIONS_IF_UNUSED = 97;
		APP_OP_AUTO_REVOKE_MANAGED_BY_INSTALLER = 98;
		}

core/res/AndroidManifest.xml

+0 −9

Original line number	Diff line number	Diff line
		@@ -1213,15 +1213,6 @@
		android:description="@string/permdesc_acceptHandovers"
		android:protectionLevel="dangerous" />

		<!-- Allows an application assigned to the Dialer role to be granted access to the telephony
		call audio streams, both TX and RX.
		<p>Protection level: signature\|appop
		-->
		<permission android:name="android.permission.ACCESS_CALL_AUDIO"
		android.label="@string/permlab_accessCallAudio"
		android:description="@string/permdesc_accessCallAudio"
		android:protectionLevel="signature\|appop" />

		<!-- ====================================================================== -->
		<!-- Permissions for accessing the device microphone -->
		<!-- ====================================================================== -->