am ad0bfe3a: Merge "Add BIND_TELECOM_CONNECTION_SERVICE permission" into mnc-dev (606e9e1c) · Commits · e / os / android_frameworks_base

api/current.txt

+1 −1

Original line number	Diff line number	Diff line
		@@ -23,7 +23,6 @@ package android {
		field public static final java.lang.String BIND_CARRIER_CONFIG_SERVICE = "android.permission.BIND_CARRIER_CONFIG_SERVICE";
		field public static final java.lang.String BIND_CARRIER_MESSAGING_SERVICE = "android.permission.BIND_CARRIER_MESSAGING_SERVICE";
		field public static final java.lang.String BIND_CHOOSER_TARGET_SERVICE = "android.permission.BIND_CHOOSER_TARGET_SERVICE";
		field public static final java.lang.String BIND_CONNECTION_SERVICE = "android.permission.BIND_CONNECTION_SERVICE";
		field public static final java.lang.String BIND_DEVICE_ADMIN = "android.permission.BIND_DEVICE_ADMIN";
		field public static final java.lang.String BIND_DREAM_SERVICE = "android.permission.BIND_DREAM_SERVICE";
		field public static final java.lang.String BIND_INCALL_SERVICE = "android.permission.BIND_INCALL_SERVICE";
		@@ -32,6 +31,7 @@ package android {
		field public static final java.lang.String BIND_NOTIFICATION_LISTENER_SERVICE = "android.permission.BIND_NOTIFICATION_LISTENER_SERVICE";
		field public static final java.lang.String BIND_PRINT_SERVICE = "android.permission.BIND_PRINT_SERVICE";
		field public static final java.lang.String BIND_REMOTEVIEWS = "android.permission.BIND_REMOTEVIEWS";
		field public static final java.lang.String BIND_TELECOM_CONNECTION_SERVICE = "android.permission.BIND_TELECOM_CONNECTION_SERVICE";
		field public static final java.lang.String BIND_TEXT_SERVICE = "android.permission.BIND_TEXT_SERVICE";
		field public static final java.lang.String BIND_TV_INPUT = "android.permission.BIND_TV_INPUT";
		field public static final java.lang.String BIND_VOICE_INTERACTION = "android.permission.BIND_VOICE_INTERACTION";

api/system-current.txt

+2 −1

Original line number	Diff line number	Diff line
		@@ -32,7 +32,7 @@ package android {
		field public static final java.lang.String BIND_CARRIER_MESSAGING_SERVICE = "android.permission.BIND_CARRIER_MESSAGING_SERVICE";
		field public static final java.lang.String BIND_CHOOSER_TARGET_SERVICE = "android.permission.BIND_CHOOSER_TARGET_SERVICE";
		field public static final java.lang.String BIND_CONDITION_PROVIDER_SERVICE = "android.permission.BIND_CONDITION_PROVIDER_SERVICE";
		field public static final java.lang.String BIND_CONNECTION_SERVICE = "android.permission.BIND_CONNECTION_SERVICE";
		field public static final deprecated java.lang.String BIND_CONNECTION_SERVICE = "android.permission.BIND_CONNECTION_SERVICE";
		field public static final java.lang.String BIND_DEVICE_ADMIN = "android.permission.BIND_DEVICE_ADMIN";
		field public static final java.lang.String BIND_DIRECTORY_SEARCH = "android.permission.BIND_DIRECTORY_SEARCH";
		field public static final java.lang.String BIND_DREAM_SERVICE = "android.permission.BIND_DREAM_SERVICE";
		@@ -43,6 +43,7 @@ package android {
		field public static final java.lang.String BIND_NOTIFICATION_LISTENER_SERVICE = "android.permission.BIND_NOTIFICATION_LISTENER_SERVICE";
		field public static final java.lang.String BIND_PRINT_SERVICE = "android.permission.BIND_PRINT_SERVICE";
		field public static final java.lang.String BIND_REMOTEVIEWS = "android.permission.BIND_REMOTEVIEWS";
		field public static final java.lang.String BIND_TELECOM_CONNECTION_SERVICE = "android.permission.BIND_TELECOM_CONNECTION_SERVICE";
		field public static final java.lang.String BIND_TEXT_SERVICE = "android.permission.BIND_TEXT_SERVICE";
		field public static final java.lang.String BIND_TRUST_AGENT = "android.permission.BIND_TRUST_AGENT";
		field public static final java.lang.String BIND_TV_INPUT = "android.permission.BIND_TV_INPUT";

core/res/AndroidManifest.xml

+11 −1

Original line number	Diff line number	Diff line
		@@ -1184,10 +1184,20 @@
		android:protectionLevel="system\|signature" />

		<!-- Must be required by a {@link android.telecom.ConnectionService},
		to ensure that only the system can bind to it. -->
		to ensure that only the system can bind to it.
		@deprecated {@link android.telecom.ConnectionService}s should require
		android.permission.BIND_TELECOM_CONNECTION_SERVICE instead.
		@SystemApi
		@hide -->
		<permission android:name="android.permission.BIND_CONNECTION_SERVICE"
		android:protectionLevel="system\|signature" />

		<!-- Must be required by a {@link android.telecom.ConnectionService},
		to ensure that only the system can bind to it. -->
		<permission android:name="android.permission.BIND_TELECOM_CONNECTION_SERVICE"
		android:protectionLevel="system\|signature" />


		<!-- @SystemApi Allows an application to control the in-call experience.
		@hide -->
		<permission android:name="android.permission.CONTROL_INCALL_EXPERIENCE"

telecomm/java/android/telecom/ConnectionService.java

+1 −1

Original line number	Diff line number	Diff line
		@@ -50,7 +50,7 @@ import java.util.concurrent.ConcurrentHashMap;
		* <pre>
		* <service android:name="com.example.package.MyConnectionService"
		* android:label="@string/some_label_for_my_connection_service"
		* android:permission="android.permission.BIND_CONNECTION_SERVICE">
		* android:permission="android.permission.BIND_TELECOM_CONNECTION_SERVICE">
		* <intent-filter>
		* <action android:name="android.telecom.ConnectionService" />
		* </intent-filter>