Merge "Create unified BIND_CARRIER_SERVICES permission" into mnc-dev (a80282a7) · Commits · e / os / android_frameworks_base

api/current.txt

+2 −2

Original line number	Diff line number	Diff line
		@@ -20,8 +20,8 @@ package android {
		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";
		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 deprecated java.lang.String BIND_CARRIER_MESSAGING_SERVICE = "android.permission.BIND_CARRIER_MESSAGING_SERVICE";
		field public static final java.lang.String BIND_CARRIER_SERVICES = "android.permission.BIND_CARRIER_SERVICES";
		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_DEVICE_ADMIN = "android.permission.BIND_DEVICE_ADMIN";
		field public static final java.lang.String BIND_DREAM_SERVICE = "android.permission.BIND_DREAM_SERVICE";

api/system-current.txt

+2 −2

Original line number	Diff line number	Diff line
		@@ -28,8 +28,8 @@ package android {
		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";
		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 deprecated java.lang.String BIND_CARRIER_MESSAGING_SERVICE = "android.permission.BIND_CARRIER_MESSAGING_SERVICE";
		field public static final java.lang.String BIND_CARRIER_SERVICES = "android.permission.BIND_CARRIER_SERVICES";
		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 deprecated java.lang.String BIND_CONNECTION_SERVICE = "android.permission.BIND_CONNECTION_SERVICE";

core/java/android/service/carrier/CarrierConfigService.java

+2 −2

Original line number	Diff line number	Diff line
		@@ -23,14 +23,14 @@ import android.os.PersistableBundle;
		* A service that sets carrier configuration for telephony services.
		* <p>
		* To extend this class, you must declare the service in your manifest file to require the
		* {@link android.Manifest.permission#BIND_CARRIER_CONFIG_SERVICE} permission and include an intent
		* {@link android.Manifest.permission#BIND_CARRIER_SERVICES} permission and include an intent
		* filter with the {@link #SERVICE_INTERFACE} action. For example:
		* </p>
		*
		* <pre>{@code
		* <service android:name=".MyCarrierConfigService"
		* android:label="@string/service_name"
		* android:permission="android.permission.BIND_CARRIER_CONFIG_SERVICE">
		* android:permission="android.permission.BIND_CARRIER_SERVICES">
		* <intent-filter>
		* <action android:name="android.service.carrier.CarrierConfigService" />
		* </intent-filter>

core/java/android/service/carrier/CarrierMessagingService.java

+2 −2

Original line number	Diff line number	Diff line
		@@ -31,12 +31,12 @@ import java.util.List;
		* A service that receives calls from the system when new SMS and MMS are
		* sent or received.
		* <p>To extend this class, you must declare the service in your manifest file with
		* the {@link android.Manifest.permission#BIND_CARRIER_MESSAGING_SERVICE} permission
		* the {@link android.Manifest.permission#BIND_CARRIER_SERVICES} permission
		* and include an intent filter with the {@link #SERVICE_INTERFACE} action. For example:</p>
		* <pre>
		* <service android:name=".MyMessagingService"
		* android:label="@string/service_name"
		* android:permission="android.permission.BIND_CARRIER_MESSAGING_SERVICE">
		* android:permission="android.permission.BIND_CARRIER_SERVICES">
		* <intent-filter>
		* <action android:name="android.service.carrier.CarrierMessagingService" />
		* </intent-filter>

core/res/AndroidManifest.xml

+7 −9

Original line number	Diff line number	Diff line
		@@ -2404,8 +2404,7 @@
		<permission android:name="android.permission.REMOVE_DRM_CERTIFICATES"
		android:protectionLevel="signature\|system" />

		<!-- Must be required by a {@link android.service.carrier.CarrierMessagingService}.
		Any service that filters for this intent must be a carrier privileged app. -->
		<!-- @deprecated Use {@link android.Manifest.permission#BIND_CARRIER_SERVICES} instead -->
		<permission android:name="android.permission.BIND_CARRIER_MESSAGING_SERVICE"
		android:protectionLevel="signature\|system" />

		@@ -2427,13 +2426,12 @@
		android:permissionGroup="android.permission-group.SYSTEM_TOOLS"
		android:protectionLevel="signature" />

		<!-- The system process that pulls carrier configuration from carrier apps will
		have this permission. Carrier apps that provide
		{@link android.service.carrier.CarrierConfigService} should require this
		permission for clients binding to their service. -->
		<permission android:name="android.permission.BIND_CARRIER_CONFIG_SERVICE"
		android:label="@string/permlab_bindCarrierConfigService"
		android:description="@string/permdesc_bindCarrierConfigService"
		<!-- The system process that is allowed to bind to services in carrier apps will
		have this permission. Carrier apps should use this permission to protect
		their services that only the system is allowed to bind to. -->
		<permission android:name="android.permission.BIND_CARRIER_SERVICES"
		android:label="@string/permlab_bindCarrierServices"
		android:description="@string/permdesc_bindCarrierServices"
		android:protectionLevel="signature\|system" />

		<!-- Allows an application to query whether DO_NOT_ASK_CREDENTIALS_ON_BOOT