Merge "Remove permission SIM_COMMUNICATION." (684b8ce8) · Commits · e / os / android_frameworks_base

api/current.txt

+0 −1

Original line number	Diff line number	Diff line
		@@ -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";

core/res/AndroidManifest.xml

+0 −8

Original line number	Diff line number	Diff line
		@@ -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.

telephony/java/android/telephony/TelephonyManager.java

+4 −4

Original line number	Diff line number	Diff line
		@@ -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