From e40c8c3b2935deb27ba646454896c26a100a6525 Mon Sep 17 00:00:00 2001 From: Betty Chang Date: Fri, 20 Mar 2020 01:30:54 +0000 Subject: [PATCH] Revert "Revert "[Telephony Mainline] To mark @hide for mainline ..." Revert "Revert "[Telephony Mainline] To mark @hide for mainline ..." Revert submission 10702401-revert-10665971-TML_revertSystemApi-ZNISIHWMFP Reason for revert: Fixing build by make framework-telephony-stubs-srcs-update-current-api (new txt file has been added for telephony) Reverted Changes: I5a320c062:Revert "[Telephony Mainline] To mark @hide for mai... I0e762e0dd:Revert "[Telephony Mainline] To mark @hide for mai... Test: make Bug:151896160 Change-Id: I6f22488aca8f2059d9fb4be48116edc52856a393 --- api/current.txt | 1 - api/system-current.txt | 4 ---- core/res/AndroidManifest.xml | 2 +- telephony/api/system-current.txt | 3 --- telephony/java/android/telephony/SmsManager.java | 3 --- telephony/java/android/telephony/SmsMessage.java | 1 + 6 files changed, 2 insertions(+), 12 deletions(-) diff --git a/api/current.txt b/api/current.txt index baad02c0278c7..01d03b1fd88bf 100644 --- a/api/current.txt +++ b/api/current.txt @@ -47959,7 +47959,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(); diff --git a/api/system-current.txt b/api/system-current.txt index fd3798908d1ea..df0571404058a 100755 --- a/api/system-current.txt +++ b/api/system-current.txt @@ -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 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.util.List, java.util.List); diff --git a/core/res/AndroidManifest.xml b/core/res/AndroidManifest.xml index ad984e6437458..4b4c0298c8838 100644 --- a/core/res/AndroidManifest.xml +++ b/core/res/AndroidManifest.xml @@ -734,7 +734,7 @@ - diff --git a/telephony/api/system-current.txt b/telephony/api/system-current.txt index 11568f16bb6a8..9d341c0d1c49a 100644 --- a/telephony/api/system-current.txt +++ b/telephony/api/system-current.txt @@ -660,11 +660,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 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.util.List, java.util.List); diff --git a/telephony/java/android/telephony/SmsManager.java b/telephony/java/android/telephony/SmsManager.java index 6aea5eeca3fd7..d2d6f8d3782ad 100644 --- a/telephony/java/android/telephony/SmsManager.java +++ b/telephony/java/android/telephony/SmsManager.java @@ -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 getMessagesFromIcc() { return getAllMessagesFromIcc(); diff --git a/telephony/java/android/telephony/SmsMessage.java b/telephony/java/android/telephony/SmsMessage.java index bc5cc9601e052..e537f666d4c0c 100644 --- a/telephony/java/android/telephony/SmsMessage.java +++ b/telephony/java/android/telephony/SmsMessage.java @@ -1198,6 +1198,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() {