Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 57cbb378 authored by Betty Chang's avatar Betty Chang
Browse files

Revert "[Telephony Mainline] To mark @hide for mainline module r..." 

Revert "[Telephony Mainline] To mark @hide for mainline module r..."

Revert submission 10665971-TML_revertSystemApi

Reason for revert: cause the build break
Reverted Changes:
I12a98578c:[Telephony Mainline] To mark @hide for mainline mo...
Ib12145dc0:[Telephony Mainline] To mark @hide for mainline mo...

Change-Id: I5a320c062058af9573a84fabbd06ace68682f3be
parent 2a1349cf

api/current.txt

+1 −0
Original line number Diff line number Diff line
@@ -47970,6 +47970,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";
@@ -11445,8 +11446,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 public void sendMultipartTextMessage(@NonNull String, @Nullable String, @NonNull java.util.List<java.lang.String>, @Nullable java.util.List<android.app.PendingIntent>, @Nullable java.util.List<android.app.PendingIntent>, @NonNull String);

























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" />

































telephony/java/android/telephony/SmsManager.java



+3
−0




























Original line number
Diff line number
Diff line








@@ -1676,6 +1676,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) {










@@ -1720,6 +1721,7 @@ public final class SmsManager {













     *















     * {@hide}















     */













    @SystemApi















    @RequiresPermission(Manifest.permission.ACCESS_MESSAGES_ON_ICC)















    public boolean deleteMessageFromIcc(int messageIndex) {















        boolean success = false;










@@ -1800,6 +1802,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








@@ -1198,7 +1198,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() {