From cdaaa91f7c67b2c56f17d5512f015c7c25c7c351 Mon Sep 17 00:00:00 2001 From: Zach Johnson Date: Wed, 13 May 2015 16:25:12 -0700 Subject: [PATCH] Create unified BIND_CARRIER_SERVICES permission Replace BIND_CARRIER_MESSAGING_SERVICE and BIND_CARRIER_CONFIG_SERVICE since we don't really need one permission for each carrier service type. Deprecate BIND_CARRIER_MESSAGING_SERVICE since it already shipped, but remove BIND_CARRIER_CONFIG_SERVICE since it hasn't. b/21165906 Change-Id: I716f3f1c98a228afcfee84cf4a48911f0736ce8c --- api/current.txt | 4 ++-- api/system-current.txt | 4 ++-- .../service/carrier/CarrierConfigService.java | 4 ++-- .../service/carrier/CarrierMessagingService.java | 4 ++-- core/res/AndroidManifest.xml | 16 +++++++--------- core/res/res/values/strings.xml | 4 ++-- 6 files changed, 17 insertions(+), 19 deletions(-) diff --git a/api/current.txt b/api/current.txt index fbb65548e34ac..710dc935e34b1 100644 --- a/api/current.txt +++ b/api/current.txt @@ -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"; diff --git a/api/system-current.txt b/api/system-current.txt index 07fb2d7dc4994..2c4675ded3388 100644 --- a/api/system-current.txt +++ b/api/system-current.txt @@ -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"; diff --git a/core/java/android/service/carrier/CarrierConfigService.java b/core/java/android/service/carrier/CarrierConfigService.java index bc42b6baa97e7..bf33ad529563b 100644 --- a/core/java/android/service/carrier/CarrierConfigService.java +++ b/core/java/android/service/carrier/CarrierConfigService.java @@ -23,14 +23,14 @@ import android.os.PersistableBundle; * A service that sets carrier configuration for telephony services. *

* 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: *

* * 
{@code
  * 
+ *       android:permission="android.permission.BIND_CARRIER_SERVICES">
  *  
  *      
  *  
diff --git a/core/java/android/service/carrier/CarrierMessagingService.java b/core/java/android/service/carrier/CarrierMessagingService.java
index d7bf10c2c7d09..f5396a347cf9c 100644
--- a/core/java/android/service/carrier/CarrierMessagingService.java
+++ b/core/java/android/service/carrier/CarrierMessagingService.java
@@ -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.
  * 
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:

  * 
  * <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>
diff --git a/core/res/AndroidManifest.xml b/core/res/AndroidManifest.xml
index 4c034b3169bdb..79532e44cdba2 100644
--- a/core/res/AndroidManifest.xml
+++ b/core/res/AndroidManifest.xml
@@ -2404,8 +2404,7 @@
     
 
-    
+    
     
 
@@ -2427,13 +2426,12 @@
                 android:permissionGroup="android.permission-group.SYSTEM_TOOLS"
                 android:protectionLevel="signature" />
 
-    
-    
+    
 
     
-    bind to a carrier config service
+    bind to carrier services
     
-    Allows the holder to bind to a carrier config service. Should never be needed for normal apps.
+    Allows the holder to bind to carrier services. Should never be needed for normal apps.