Merge "Make BIND_INCALL_SERVICE and BIND_CONNECTION_SERVICE public" into mnc-dev (f7143ce6) · Commits · e / os / android_frameworks_base

api/current.txt

+3 −1

Original line number	Diff line number	Diff line
		@@ -23,8 +23,10 @@ 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";
		field public static final java.lang.String BIND_INPUT_METHOD = "android.permission.BIND_INPUT_METHOD";
		field public static final java.lang.String BIND_MEDIA_ROUTE_SERVICE = "android.permission.BIND_MEDIA_ROUTE_SERVICE";
		field public static final java.lang.String BIND_NFC_SERVICE = "android.permission.BIND_NFC_SERVICE";
		@@ -30433,7 +30435,6 @@ package android.telecom {
		public static abstract class InCallService.VideoCall {
		ctor public InCallService.VideoCall();
		method public abstract void registerCallback(android.telecom.InCallService.VideoCall.Callback);
		method public abstract void unregisterCallback();
		method public abstract void requestCallDataUsage();
		method public abstract void requestCameraCapabilities();
		method public abstract void sendSessionModifyRequest(android.telecom.VideoProfile);
		@@ -30444,6 +30445,7 @@ package android.telecom {
		method public abstract void setPauseImage(java.lang.String);
		method public abstract void setPreviewSurface(android.view.Surface);
		method public abstract void setZoom(float);
		method public abstract void unregisterCallback();
		}

		public static abstract class InCallService.VideoCall.Callback {

api/system-current.txt

+1 −1

Original line number	Diff line number	Diff line
		@@ -32550,7 +32550,6 @@ package android.telecom {
		public static abstract class InCallService.VideoCall {
		ctor public InCallService.VideoCall();
		method public abstract void registerCallback(android.telecom.InCallService.VideoCall.Callback);
		method public abstract void unregisterCallback();
		method public abstract void requestCallDataUsage();
		method public abstract void requestCameraCapabilities();
		method public abstract void sendSessionModifyRequest(android.telecom.VideoProfile);
		@@ -32561,6 +32560,7 @@ package android.telecom {
		method public abstract void setPauseImage(java.lang.String);
		method public abstract void setPreviewSurface(android.view.Surface);
		method public abstract void setZoom(float);
		method public abstract void unregisterCallback();
		}

		public static abstract class InCallService.VideoCall.Callback {

core/res/AndroidManifest.xml

+4 −4

Original line number	Diff line number	Diff line
		@@ -1178,13 +1178,13 @@
		<permission android:name="android.permission.REGISTER_CONNECTION_MANAGER"
		android:protectionLevel="system\|signature" />

		<!-- @SystemApi Allows an application to bind to InCallService implementations.
		@hide -->
		<!-- Must be required by a {@link android.telecom.InCallService},
		to ensure that only the system can bind to it. -->
		<permission android:name="android.permission.BIND_INCALL_SERVICE"
		android:protectionLevel="system\|signature" />

		<!-- @SystemApi Allows an application to bind to ConnectionService implementations.
		@hide -->
		<!-- 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_CONNECTION_SERVICE"
		android:protectionLevel="system\|signature" />