Merge "Introduce ANSWER_PHONE_CALLS permission" (247a3c01) · Commits · e / os / android_frameworks_base

api/current.txt

+4 −0

Original line number	Diff line number	Diff line
		@@ -16,6 +16,7 @@ package android {
		field public static final java.lang.String ACCOUNT_MANAGER = "android.permission.ACCOUNT_MANAGER";
		field public static final java.lang.String ADD_VOICEMAIL = "com.android.voicemail.permission.ADD_VOICEMAIL";
		field public static final java.lang.String ALLOCATE_AGGRESSIVE = "android.permission.ALLOCATE_AGGRESSIVE";
		field public static final java.lang.String ANSWER_PHONE_CALLS = "android.permission.ANSWER_PHONE_CALLS";
		field public static final java.lang.String BATTERY_STATS = "android.permission.BATTERY_STATS";
		field public static final java.lang.String BIND_ACCESSIBILITY_SERVICE = "android.permission.BIND_ACCESSIBILITY_SERVICE";
		field public static final java.lang.String BIND_APPWIDGET = "android.permission.BIND_APPWIDGET";
		@@ -4143,6 +4144,7 @@ package android.app {
		field public static final int MODE_ERRORED = 2; // 0x2
		field public static final int MODE_IGNORED = 1; // 0x1
		field public static final java.lang.String OPSTR_ADD_VOICEMAIL = "android:add_voicemail";
		field public static final java.lang.String OPSTR_ANSWER_PHONE_CALLS = "android:answer_phone_calls";
		field public static final java.lang.String OPSTR_BODY_SENSORS = "android:body_sensors";
		field public static final java.lang.String OPSTR_CALL_PHONE = "android:call_phone";
		field public static final java.lang.String OPSTR_CAMERA = "android:camera";
		@@ -38721,6 +38723,8 @@ package android.telecom {
		}

		public class TelecomManager {
		method public void acceptRingingCall();
		method public void acceptRingingCall(int);
		method public void addNewIncomingCall(android.telecom.PhoneAccountHandle, android.os.Bundle);
		method public void cancelMissedCallsNotification();
		method public android.content.Intent createManageBlockedNumbersIntent();

api/system-current.txt

+2 −0

Original line number	Diff line number	Diff line
		@@ -25,6 +25,7 @@ package android {
		field public static final java.lang.String ADD_VOICEMAIL = "com.android.voicemail.permission.ADD_VOICEMAIL";
		field public static final java.lang.String ALLOCATE_AGGRESSIVE = "android.permission.ALLOCATE_AGGRESSIVE";
		field public static final java.lang.String ALLOW_ANY_CODEC_FOR_PLAYBACK = "android.permission.ALLOW_ANY_CODEC_FOR_PLAYBACK";
		field public static final java.lang.String ANSWER_PHONE_CALLS = "android.permission.ANSWER_PHONE_CALLS";
		field public static final java.lang.String BACKUP = "android.permission.BACKUP";
		field public static final java.lang.String BATTERY_STATS = "android.permission.BATTERY_STATS";
		field public static final java.lang.String BIND_ACCESSIBILITY_SERVICE = "android.permission.BIND_ACCESSIBILITY_SERVICE";
		@@ -4286,6 +4287,7 @@ package android.app {
		field public static final int MODE_IGNORED = 1; // 0x1
		field public static final java.lang.String OPSTR_ACTIVATE_VPN = "android:activate_vpn";
		field public static final java.lang.String OPSTR_ADD_VOICEMAIL = "android:add_voicemail";
		field public static final java.lang.String OPSTR_ANSWER_PHONE_CALLS = "android:answer_phone_calls";
		field public static final java.lang.String OPSTR_BODY_SENSORS = "android:body_sensors";
		field public static final java.lang.String OPSTR_CALL_PHONE = "android:call_phone";
		field public static final java.lang.String OPSTR_CAMERA = "android:camera";

api/test-current.txt

+4 −0

Original line number	Diff line number	Diff line
		@@ -16,6 +16,7 @@ package android {
		field public static final java.lang.String ACCOUNT_MANAGER = "android.permission.ACCOUNT_MANAGER";
		field public static final java.lang.String ADD_VOICEMAIL = "com.android.voicemail.permission.ADD_VOICEMAIL";
		field public static final java.lang.String ALLOCATE_AGGRESSIVE = "android.permission.ALLOCATE_AGGRESSIVE";
		field public static final java.lang.String ANSWER_PHONE_CALLS = "android.permission.ANSWER_PHONE_CALLS";
		field public static final java.lang.String BATTERY_STATS = "android.permission.BATTERY_STATS";
		field public static final java.lang.String BIND_ACCESSIBILITY_SERVICE = "android.permission.BIND_ACCESSIBILITY_SERVICE";
		field public static final java.lang.String BIND_APPWIDGET = "android.permission.BIND_APPWIDGET";
		@@ -4153,6 +4154,7 @@ package android.app {
		field public static final int MODE_ERRORED = 2; // 0x2
		field public static final int MODE_IGNORED = 1; // 0x1
		field public static final java.lang.String OPSTR_ADD_VOICEMAIL = "android:add_voicemail";
		field public static final java.lang.String OPSTR_ANSWER_PHONE_CALLS = "android:answer_phone_calls";
		field public static final java.lang.String OPSTR_BODY_SENSORS = "android:body_sensors";
		field public static final java.lang.String OPSTR_CALL_PHONE = "android:call_phone";
		field public static final java.lang.String OPSTR_CAMERA = "android:camera";
		@@ -38905,6 +38907,8 @@ package android.telecom {
		}

		public class TelecomManager {
		method public void acceptRingingCall();
		method public void acceptRingingCall(int);
		method public void addNewIncomingCall(android.telecom.PhoneAccountHandle, android.os.Bundle);
		method public void cancelMissedCallsNotification();
		method public android.content.Intent createManageBlockedNumbersIntent();

core/java/android/app/AppOpsManager.java

+15 −1

Original line number	Diff line number	Diff line
		@@ -249,8 +249,10 @@ public class AppOpsManager {
		public static final int OP_ENTER_PICTURE_IN_PICTURE_ON_HIDE = 67;
		/** @hide Instant app start foreground service. */
		public static final int OP_INSTANT_APP_START_FOREGROUND = 68;
		/** @hide Answer incoming phone calls */
		public static final int OP_ANSWER_PHONE_CALLS = 69;
		/** @hide */
		public static final int _NUM_OP = 69;
		public static final int _NUM_OP = 70;

		/** Access to coarse location information. */
		public static final String OPSTR_COARSE_LOCATION = "android:coarse_location";
		@@ -356,6 +358,9 @@ public class AppOpsManager {
		/** @hide */
		public static final String OPSTR_INSTANT_APP_START_FOREGROUND
		= "android:instant_app_start_foreground";
		/** Answer incoming phone calls */
		public static final String OPSTR_ANSWER_PHONE_CALLS
		= "android:answer_phone_calls";

		private static final int[] RUNTIME_AND_APPOP_PERMISSIONS_OPS = {
		// RUNTIME PERMISSIONS
		@@ -388,6 +393,7 @@ public class AppOpsManager {
		OP_ADD_VOICEMAIL,
		OP_USE_SIP,
		OP_PROCESS_OUTGOING_CALLS,
		OP_ANSWER_PHONE_CALLS,
		// Microphone
		OP_RECORD_AUDIO,
		// Camera
		@@ -480,6 +486,7 @@ public class AppOpsManager {
		OP_REQUEST_INSTALL_PACKAGES,
		OP_ENTER_PICTURE_IN_PICTURE_ON_HIDE,
		OP_INSTANT_APP_START_FOREGROUND,
		OP_ANSWER_PHONE_CALLS
		};

		/**
		@@ -556,6 +563,7 @@ public class AppOpsManager {
		null, // OP_REQUEST_INSTALL_PACKAGES
		null,
		OPSTR_INSTANT_APP_START_FOREGROUND,
		OPSTR_ANSWER_PHONE_CALLS,
		};

		/**
		@@ -632,6 +640,7 @@ public class AppOpsManager {
		"REQUEST_INSTALL_PACKAGES",
		"OP_ENTER_PICTURE_IN_PICTURE_ON_HIDE",
		"INSTANT_APP_START_FOREGROUND",
		"ANSWER_PHONE_CALLS",
		};

		/**
		@@ -708,6 +717,7 @@ public class AppOpsManager {
		Manifest.permission.REQUEST_INSTALL_PACKAGES,
		null, // no permission for entering picture-in-picture on hide
		Manifest.permission.INSTANT_APP_FOREGROUND_SERVICE,
		Manifest.permission.ANSWER_PHONE_CALLS,
		};

		/**
		@@ -785,6 +795,7 @@ public class AppOpsManager {
		null, // REQUEST_INSTALL_PACKAGES
		null, // ENTER_PICTURE_IN_PICTURE_ON_HIDE
		null, // INSTANT_APP_START_FOREGROUND
		null, // ANSWER_PHONE_CALLS
		};

		/**
		@@ -861,6 +872,7 @@ public class AppOpsManager {
		false, // REQUEST_INSTALL_PACKAGES
		false, // ENTER_PICTURE_IN_PICTURE_ON_HIDE
		false, // INSTANT_APP_START_FOREGROUND
		false, // ANSWER_PHONE_CALLS
		};

		/**
		@@ -936,6 +948,7 @@ public class AppOpsManager {
		AppOpsManager.MODE_DEFAULT, // OP_REQUEST_INSTALL_PACKAGES
		AppOpsManager.MODE_ALLOWED, // OP_ENTER_PICTURE_IN_PICTURE_ON_HIDE
		AppOpsManager.MODE_DEFAULT, // OP_INSTANT_APP_START_FOREGROUND
		AppOpsManager.MODE_ALLOWED, // ANSWER_PHONE_CALLS
		};

		/**
		@@ -1015,6 +1028,7 @@ public class AppOpsManager {
		false, // OP_REQUEST_INSTALL_PACKAGES
		false, // OP_ENTER_PICTURE_IN_PICTURE_ON_HIDE
		false,
		false, // ANSWER_PHONE_CALLS
		};

		/**

core/res/AndroidManifest.xml

+11 −0

Original line number	Diff line number	Diff line
		@@ -897,6 +897,17 @@
		android:description="@string/permdesc_processOutgoingCalls"
		android:protectionLevel="dangerous" />


		<!-- Allows the app to answer an incoming phone call.
		<p>Protection level: dangerous
		-->
		<permission android:name="android.permission.ANSWER_PHONE_CALLS"
		android:permissionGroup="android.permission-group.PHONE"
		android:label="@string/permlab_answerPhoneCalls"
		android:description="@string/permdesc_answerPhoneCalls"
		android:protectionLevel="dangerous" />


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