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

Commit 252c2794 authored by Betty Chang's avatar Betty Chang Committed by Automerger Merge Worker
Browse files

Merge "[Telephony Mainline] To mark @hide for mainline module reverting" into... 

Merge "[Telephony Mainline] To mark @hide for mainline module reverting" into rvc-dev am: 2490ec4d am: d7d494f1 am: e4986d23

Change-Id: Ib5662bd3bb3ceba1430e6f3abdeb5940725531df
parents d1e7bd31 e4986d23

api/current.txt

+0 −1
Original line number Diff line number Diff line
@@ -47960,7 +47960,6 @@ 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

+0 −4
Original line number Diff line number Diff line
@@ -10,7 +10,6 @@ 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";
@@ -11342,11 +11341,8 @@ 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 />





























    <!-- @SystemApi Allows accessing the messages on ICC













    <!-- 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



+0
−3




























Original line number
Diff line number
Diff line








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










@@ -1717,7 +1716,6 @@ public final class SmsManager {













     *















     * {@hide}















     */













    @SystemApi















    @RequiresPermission(Manifest.permission.ACCESS_MESSAGES_ON_ICC)















    public boolean deleteMessageFromIcc(int messageIndex) {















        boolean success = false;










@@ -1798,7 +1796,6 @@ 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



+1
−0




























Original line number
Diff line number
Diff line








@@ -1195,6 +1195,7 @@ public class SmsMessage {













    /**















     * Returns the recipient address(receiver) of this SMS message in String form or null if















     * unavailable.













     * {@hide}















     */















    @Nullable















    public String getRecipientAddress() {