From cdaaa91f7c67b2c56f17d5512f015c7c25c7c351 Mon Sep 17 00:00:00 2001 From: Zach Johnson Date: Wed, 13 May 2015 16:25:12 -0700 Subject: 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 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) (limited to 'api') diff --git a/api/current.txt b/api/current.txt index fbb65548e34a..710dc935e34b 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 07fb2d7dc499..2c4675ded338 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"; -- cgit v1.2.3-59-g8ed1b