diff options
| author | Shishir Agrawal <shishir@google.com> | 2014-07-08 19:09:09 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2014-07-07 17:47:39 +0000 |
| commit | 684b8ce8de45ccec5034bef14a4cb353fc63c31c (patch) | |
| tree | d990d1f7dc1659d432a84453c6547611a0ede83f | |
| parent | a3bf3e5c849bfb3bf0a74dcc06ef032355183c2e (diff) | |
| parent | b708ce5f1a30a63ed79a86a23ead4e5ad972a48a (diff) | |
| download | frameworks_base-684b8ce8de45ccec5034bef14a4cb353fc63c31c.zip frameworks_base-684b8ce8de45ccec5034bef14a4cb353fc63c31c.tar.gz frameworks_base-684b8ce8de45ccec5034bef14a4cb353fc63c31c.tar.bz2 | |
Merge "Remove permission SIM_COMMUNICATION."
| -rw-r--r-- | api/current.txt | 1 | ||||
| -rw-r--r-- | core/res/AndroidManifest.xml | 8 | ||||
| -rw-r--r-- | telephony/java/android/telephony/TelephonyManager.java | 8 |
3 files changed, 4 insertions, 13 deletions
diff --git a/api/current.txt b/api/current.txt index 95f6461..4b082f3 100644 --- a/api/current.txt +++ b/api/current.txt @@ -134,7 +134,6 @@ package android { field public static final java.lang.String SET_WALLPAPER = "android.permission.SET_WALLPAPER"; field public static final java.lang.String SET_WALLPAPER_HINTS = "android.permission.SET_WALLPAPER_HINTS"; field public static final java.lang.String SIGNAL_PERSISTENT_PROCESSES = "android.permission.SIGNAL_PERSISTENT_PROCESSES"; - field public static final java.lang.String SIM_COMMUNICATION = "android.permission.SIM_COMMUNICATION"; field public static final java.lang.String STATUS_BAR = "android.permission.STATUS_BAR"; field public static final java.lang.String SUBSCRIBED_FEEDS_READ = "android.permission.SUBSCRIBED_FEEDS_READ"; field public static final java.lang.String SUBSCRIBED_FEEDS_WRITE = "android.permission.SUBSCRIBED_FEEDS_WRITE"; diff --git a/core/res/AndroidManifest.xml b/core/res/AndroidManifest.xml index e675dc7..2d1cc59 100644 --- a/core/res/AndroidManifest.xml +++ b/core/res/AndroidManifest.xml @@ -1068,14 +1068,6 @@ android:permissionGroup="android.permission-group.SYSTEM_TOOLS" android:protectionLevel="signature" /> - <!-- Allows an application to communicate with a SIM card using logical - channels. --> - <permission android:name="android.permission.SIM_COMMUNICATION" - android:permissionGroup="android.permission-group.SYSTEM_TOOLS" - android:label="@string/permlab_sim_communication" - android:description="@string/permdesc_sim_communication" - android:protectionLevel="dangerous" /> - <!-- @SystemApi Allows TvInputService to access underlying TV input hardware such as built-in tuners and HDMI-in's. @hide This should only be used by OEM's TvInputService's. diff --git a/telephony/java/android/telephony/TelephonyManager.java b/telephony/java/android/telephony/TelephonyManager.java index b29cc12..4930255 100644 --- a/telephony/java/android/telephony/TelephonyManager.java +++ b/telephony/java/android/telephony/TelephonyManager.java @@ -2300,7 +2300,7 @@ public class TelephonyManager { * Input parameters equivalent to TS 27.007 AT+CCHO command. * * <p>Requires Permission: - * {@link android.Manifest.permission#SIM_COMMUNICATION SIM_COMMUNICATION} + * {@link android.Manifest.permission#MODIFY_PHONE_STATE MODIFY_PHONE_STATE} * * @param AID Application id. See ETSI 102.221 and 101.220. * @return The logical channel id which is negative on error. @@ -2322,7 +2322,7 @@ public class TelephonyManager { * Input parameters equivalent to TS 27.007 AT+CCHC command. * * <p>Requires Permission: - * {@link android.Manifest.permission#SIM_COMMUNICATION SIM_COMMUNICATION} + * {@link android.Manifest.permission#MODIFY_PHONE_STATE MODIFY_PHONE_STATE} * * @param channel is the channel id to be closed as retruned by a successful * iccOpenLogicalChannel. @@ -2345,7 +2345,7 @@ public class TelephonyManager { * Input parameters equivalent to TS 27.007 AT+CGLA command. * * <p>Requires Permission: - * {@link android.Manifest.permission#SIM_COMMUNICATION SIM_COMMUNICATION} + * {@link android.Manifest.permission#MODIFY_PHONE_STATE MODIFY_PHONE_STATE} * * @param channel is the channel id to be closed as returned by a successful * iccOpenLogicalChannel. @@ -2376,7 +2376,7 @@ public class TelephonyManager { * Send ENVELOPE to the SIM and return the response. * * <p>Requires Permission: - * {@link android.Manifest.permission#SIM_COMMUNICATION SIM_COMMUNICATION} + * {@link android.Manifest.permission#MODIFY_PHONE_STATE MODIFY_PHONE_STATE} * * @param content String containing SAT/USAT response in hexadecimal * format starting with command tag. See TS 102 223 for |