Merge "Revert "[Telephony Mainline] To mark @hide for mainline module r...""... (b998b1f1) · Commits · e / os / android_frameworks_base

api/current.txt

+1 −0

Original line number	Diff line number	Diff line
		@@ -47969,6 +47969,7 @@ package android.telephony {
		method public byte[] getPdu();
		method public int getProtocolIdentifier();
		method public String getPseudoSubject();
		method @Nullable public String getRecipientAddress();
		method public String getServiceCenterAddress();
		method public int getStatus();
		method public int getStatusOnIcc();

api/system-current.txt

+4 −0

Original line number	Diff line number	Diff line
		@@ -10,6 +10,7 @@ package android {
		field @Deprecated public static final String ACCESS_FM_RADIO = "android.permission.ACCESS_FM_RADIO";
		field public static final String ACCESS_INSTANT_APPS = "android.permission.ACCESS_INSTANT_APPS";
		field public static final String ACCESS_LOCUS_ID_USAGE_STATS = "android.permission.ACCESS_LOCUS_ID_USAGE_STATS";
		field public static final String ACCESS_MESSAGES_ON_ICC = "android.permission.ACCESS_MESSAGES_ON_ICC";
		field public static final String ACCESS_MOCK_LOCATION = "android.permission.ACCESS_MOCK_LOCATION";
		field public static final String ACCESS_MTP = "android.permission.ACCESS_MTP";
		field public static final String ACCESS_NETWORK_CONDITIONS = "android.permission.ACCESS_NETWORK_CONDITIONS";
		@@ -11349,8 +11350,11 @@ package android.telephony {
		}

		public final class SmsManager {
		method @RequiresPermission(android.Manifest.permission.ACCESS_MESSAGES_ON_ICC) public boolean copyMessageToIcc(@Nullable byte[], @NonNull byte[], int);
		method @RequiresPermission(android.Manifest.permission.ACCESS_MESSAGES_ON_ICC) public boolean deleteMessageFromIcc(int);
		method public boolean disableCellBroadcastRange(int, int, int);
		method public boolean enableCellBroadcastRange(int, int, int);
		method @NonNull @RequiresPermission(android.Manifest.permission.ACCESS_MESSAGES_ON_ICC) public java.util.List<android.telephony.SmsMessage> getMessagesFromIcc();
		method @RequiresPermission(android.Manifest.permission.READ_PRIVILEGED_PHONE_STATE) public int getPremiumSmsConsent(@NonNull String);
		method @RequiresPermission(android.Manifest.permission.READ_PRIVILEGED_PHONE_STATE) public int getSmsCapacityOnIcc();
		method @RequiresPermission(android.Manifest.permission.MODIFY_PHONE_STATE) public void sendMultipartTextMessageWithoutPersisting(String, String, java.util.List<java.lang.String>, java.util.List<android.app.PendingIntent>, java.util.List<android.app.PendingIntent>);

core/res/AndroidManifest.xml

+1 −1

Original line number	Diff line number	Diff line
		@@ -734,7 +734,7 @@
		<!-- ====================================================================== -->
		<eat-comment />

		<!-- Allows accessing the messages on ICC
		<!-- @SystemApi Allows accessing the messages on ICC
		@hide Used internally. -->
		<permission android:name="android.permission.ACCESS_MESSAGES_ON_ICC"
		android:protectionLevel="signature" />

telephony/java/android/telephony/SmsManager.java

+3 −0

Original line number	Diff line number	Diff line
		@@ -1672,6 +1672,7 @@ public final class SmsManager {
		* @throws IllegalArgumentException if pdu is null.
		* @hide
		*/
		@SystemApi
		@RequiresPermission(Manifest.permission.ACCESS_MESSAGES_ON_ICC)
		public boolean copyMessageToIcc(
		@Nullable byte[] smsc, @NonNull byte[] pdu, @StatusOnIcc int status) {
		@@ -1716,6 +1717,7 @@ public final class SmsManager {
		*
		* {@hide}
		*/
		@SystemApi
		@RequiresPermission(Manifest.permission.ACCESS_MESSAGES_ON_ICC)
		public boolean deleteMessageFromIcc(int messageIndex) {
		boolean success = false;
		@@ -1796,6 +1798,7 @@ public final class SmsManager {
		*
		* {@hide}
		*/
		@SystemApi
		@RequiresPermission(Manifest.permission.ACCESS_MESSAGES_ON_ICC)
		public @NonNull List<SmsMessage> getMessagesFromIcc() {
		return getAllMessagesFromIcc();

telephony/java/android/telephony/SmsMessage.java

+0 −1

Original line number	Diff line number	Diff line
		@@ -1195,7 +1195,6 @@ public class SmsMessage {
		/**
		* Returns the recipient address(receiver) of this SMS message in String form or null if
		* unavailable.
		* {@hide}
		*/
		@Nullable
		public String getRecipientAddress() {