Merge "Add handover permission, fill in some missing API gaps." (d0f9811f) · Commits · e / os / android_frameworks_base

api/current.txt

+2 −0

Original line number	Diff line number	Diff line
		@@ -6,6 +6,7 @@ package android {

		public static final class Manifest.permission {
		ctor public Manifest.permission();
		field public static final java.lang.String ACCEPT_HANDOVER = "android.permission.ACCEPT_HANDOVER";
		field public static final java.lang.String ACCESS_CHECKIN_PROPERTIES = "android.permission.ACCESS_CHECKIN_PROPERTIES";
		field public static final java.lang.String ACCESS_COARSE_LOCATION = "android.permission.ACCESS_COARSE_LOCATION";
		field public static final java.lang.String ACCESS_FINE_LOCATION = "android.permission.ACCESS_FINE_LOCATION";
		@@ -40410,6 +40411,7 @@ package android.telecom {
		method public void onCallEvent(java.lang.String, android.os.Bundle);
		method public void onDisconnect();
		method public void onExtrasChanged(android.os.Bundle);
		method public void onHandoverComplete();
		method public void onHold();
		method public void onPlayDtmfTone(char);
		method public void onPostDialContinue(boolean);

api/system-current.txt

+1 −0

Original line number	Diff line number	Diff line
		@@ -253,6 +253,7 @@ package android.app {
		public class AppOpsManager {
		method public static java.lang.String[] getOpStrs();
		method public void setUidMode(java.lang.String, int, int);
		field public static final java.lang.String OPSTR_ACCEPT_HANDOVER = "android:accept_handover";
		field public static final java.lang.String OPSTR_ACCESS_NOTIFICATIONS = "android:access_notifications";
		field public static final java.lang.String OPSTR_ACTIVATE_VPN = "android:activate_vpn";
		field public static final java.lang.String OPSTR_ASSIST_SCREENSHOT = "android:assist_screenshot";

api/test-current.txt

+1 −0

Original line number	Diff line number	Diff line
		@@ -48,6 +48,7 @@ package android.app {
		public class AppOpsManager {
		method public static java.lang.String[] getOpStrs();
		method public void setMode(int, int, java.lang.String, int);
		field public static final java.lang.String OPSTR_ACCEPT_HANDOVER = "android:accept_handover";
		field public static final java.lang.String OPSTR_ACCESS_NOTIFICATIONS = "android:access_notifications";
		field public static final java.lang.String OPSTR_ACTIVATE_VPN = "android:activate_vpn";
		field public static final java.lang.String OPSTR_ASSIST_SCREENSHOT = "android:assist_screenshot";

core/java/android/app/AppOpsManager.java

+19 −2

Original line number	Diff line number	Diff line
		@@ -263,8 +263,10 @@ public class AppOpsManager {
		public static final int OP_REQUEST_DELETE_PACKAGES = 72;
		/** @hide Bind an accessibility service. */
		public static final int OP_BIND_ACCESSIBILITY_SERVICE = 73;
		/** @hide Continue handover of a call from another app */
		public static final int OP_ACCEPT_HANDOVER = 74;
		/** @hide */
		public static final int _NUM_OP = 74;
		public static final int _NUM_OP = 75;

		/** Access to coarse location information. */
		public static final String OPSTR_COARSE_LOCATION = "android:coarse_location";
		@@ -378,7 +380,13 @@ public class AppOpsManager {
		/** Answer incoming phone calls */
		public static final String OPSTR_ANSWER_PHONE_CALLS
		= "android:answer_phone_calls";

		/**
		* Accept call handover
		* @hide
		*/
		@SystemApi @TestApi
		public static final String OPSTR_ACCEPT_HANDOVER
		= "android:accept_handover";
		/** @hide */
		@SystemApi @TestApi
		public static final String OPSTR_GPS = "android:gps";
		@@ -528,6 +536,7 @@ public class AppOpsManager {
		OP_USE_SIP,
		OP_PROCESS_OUTGOING_CALLS,
		OP_ANSWER_PHONE_CALLS,
		OP_ACCEPT_HANDOVER,
		// Microphone
		OP_RECORD_AUDIO,
		// Camera
		@@ -626,6 +635,7 @@ public class AppOpsManager {
		OP_CHANGE_WIFI_STATE,
		OP_REQUEST_DELETE_PACKAGES,
		OP_BIND_ACCESSIBILITY_SERVICE,
		OP_ACCEPT_HANDOVER,
		};

		/**
		@@ -706,6 +716,7 @@ public class AppOpsManager {
		OPSTR_CHANGE_WIFI_STATE,
		OPSTR_REQUEST_DELETE_PACKAGES,
		OPSTR_BIND_ACCESSIBILITY_SERVICE,
		OPSTR_ACCEPT_HANDOVER,
		};

		/**
		@@ -787,6 +798,7 @@ public class AppOpsManager {
		"CHANGE_WIFI_STATE",
		"REQUEST_DELETE_PACKAGES",
		"BIND_ACCESSIBILITY_SERVICE",
		"ACCEPT_HANDOVER",
		};

		/**
		@@ -868,6 +880,7 @@ public class AppOpsManager {
		Manifest.permission.CHANGE_WIFI_STATE,
		Manifest.permission.REQUEST_DELETE_PACKAGES,
		Manifest.permission.BIND_ACCESSIBILITY_SERVICE,
		Manifest.permission.ACCEPT_HANDOVER,
		};

		/**
		@@ -950,6 +963,7 @@ public class AppOpsManager {
		null, // OP_CHANGE_WIFI_STATE
		null, // REQUEST_DELETE_PACKAGES
		null, // OP_BIND_ACCESSIBILITY_SERVICE
		null, // ACCEPT_HANDOVER
		};

		/**
		@@ -1031,6 +1045,7 @@ public class AppOpsManager {
		false, // OP_CHANGE_WIFI_STATE
		false, // OP_REQUEST_DELETE_PACKAGES
		false, // OP_BIND_ACCESSIBILITY_SERVICE
		false, // ACCEPT_HANDOVER
		};

		/**
		@@ -1111,6 +1126,7 @@ public class AppOpsManager {
		AppOpsManager.MODE_ALLOWED, // OP_CHANGE_WIFI_STATE
		AppOpsManager.MODE_ALLOWED, // REQUEST_DELETE_PACKAGES
		AppOpsManager.MODE_ALLOWED, // OP_BIND_ACCESSIBILITY_SERVICE
		AppOpsManager.MODE_ALLOWED, // ACCEPT_HANDOVER
		};

		/**
		@@ -1195,6 +1211,7 @@ public class AppOpsManager {
		false, // OP_CHANGE_WIFI_STATE
		false, // OP_REQUEST_DELETE_PACKAGES
		false, // OP_BIND_ACCESSIBILITY_SERVICE
		false, // ACCEPT_HANDOVER
		};

		/**

core/res/AndroidManifest.xml

+17 −0

Original line number	Diff line number	Diff line
		@@ -971,6 +971,23 @@
		android:description="@string/permdesc_manageOwnCalls"
		android:protectionLevel="normal" />

		<!-- Allows a calling app to continue a call which was started in another app. An example is a
		video calling app that wants to continue a voice call on the user's mobile network.<p>
		When the handover of a call from one app to another takes place, there are two devices
		which are involved in the handover; the initiating and receiving devices. The initiating
		device is where the request to handover the call was started, and the receiving device is
		where the handover request is confirmed by the other party.<p>
		This permission protects access to the
		{@link android.telecom.TelecomManager#acceptHandover(Uri, int, PhoneAccountHandle)} which
		the receiving side of the handover uses to accept a handover.
		<p>Protection level: dangerous
		-->
		<permission android:name="android.permission.ACCEPT_HANDOVER"
		android:permissionGroup="android.permission-group.PHONE"
		android.label="@string/permlab_acceptHandover"
		android:description="@string/permdesc_acceptHandovers"
		android:protectionLevel="dangerous" />

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