Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Change createFromNativeSmsSubmitPdu for API review" am: 967a468a78

Browse Source 
Change-Id: I03e4563726d7d397cc7e1753a9e0188c0056ea2d
This commit is contained in:
Automerger Merge Worker
2020-03-03 18:18:18 +00:00
parent 962f149147 967a468a78
commit eb7eca6f46
5 changed files with 8 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
api/current.txt
View File

@@ -45670,6 +45670,7 @@ package android.telephony {
method public static int[] calculateLength(String, boolean); method public static int[] calculateLength(String, boolean);
method @Deprecated public static android.telephony.SmsMessage createFromPdu(byte[]); method @Deprecated public static android.telephony.SmsMessage createFromPdu(byte[]);
method public static android.telephony.SmsMessage createFromPdu(byte[], String); method public static android.telephony.SmsMessage createFromPdu(byte[], String);
method @Nullable public static android.telephony.SmsMessage createSmsSubmitPdu(@NonNull byte[], boolean);
method public String getDisplayMessageBody(); method public String getDisplayMessageBody();
method public String getDisplayOriginatingAddress(); method public String getDisplayOriginatingAddress();
method public String getEmailBody(); method public String getEmailBody();

1
api/system-current.txt
View File

@@ -9236,7 +9236,6 @@ package android.telephony {
} }
public class SmsMessage { public class SmsMessage {
method @Nullable public static android.telephony.SmsMessage createFromNativeSmsSubmitPdu(@NonNull byte[], boolean);
method @Nullable public static android.telephony.SmsMessage.SubmitPdu getSmsPdu(int, int, @Nullable String, @NonNull String, @NonNull String, long); method @Nullable public static android.telephony.SmsMessage.SubmitPdu getSmsPdu(int, int, @Nullable String, @NonNull String, @NonNull String, long);
method @NonNull @RequiresPermission(android.Manifest.permission.BLUETOOTH_PRIVILEGED) public static byte[] getSubmitPduEncodedMessage(boolean, @NonNull String, @NonNull String, int, int, int, int, int, int); method @NonNull @RequiresPermission(android.Manifest.permission.BLUETOOTH_PRIVILEGED) public static byte[] getSubmitPduEncodedMessage(boolean, @NonNull String, @NonNull String, int, int, int, int, int, int);
} }

5
telephony/java/android/telephony/SmsMessage.java
View File

@@ -320,12 +320,9 @@ public class SmsMessage {
* @param data Message data. * @param data Message data.
* @param isCdma Indicates weather the type of the SMS is CDMA. * @param isCdma Indicates weather the type of the SMS is CDMA.
* @return An SmsMessage representing the message. * @return An SmsMessage representing the message.
*
* @hide
*/ */
@SystemApi
@Nullable @Nullable
public static SmsMessage createFromNativeSmsSubmitPdu(@NonNull byte[] data, boolean isCdma) { public static SmsMessage createSmsSubmitPdu(@NonNull byte[] data, boolean isCdma) {
SmsMessageBase wrappedMessage; SmsMessageBase wrappedMessage;
if (isCdma) { if (isCdma) {

4
telephony/java/com/android/internal/telephony/cdma/SmsMessage.java
View File

@@ -18,6 +18,7 @@ package com.android.internal.telephony.cdma;
import android.compat.annotation.UnsupportedAppUsage; import android.compat.annotation.UnsupportedAppUsage;
import android.content.res.Resources; import android.content.res.Resources;
import android.os.Build;
import android.sysprop.TelephonyProperties; import android.sysprop.TelephonyProperties;
import android.telephony.PhoneNumberUtils; import android.telephony.PhoneNumberUtils;
import android.telephony.SmsCbLocation; import android.telephony.SmsCbLocation;
@@ -156,7 +157,8 @@ public class SmsMessage extends SmsMessageBase {
* *
* @hide * @hide
*/ */
@UnsupportedAppUsage @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.Q, publicAlternatives = "Use {@link "
+ "android.telephony.SmsMessage} API instead")
public static SmsMessage createFromEfRecord(int index, byte[] data) { public static SmsMessage createFromEfRecord(int index, byte[] data) {
try { try {
SmsMessage msg = new SmsMessage(); SmsMessage msg = new SmsMessage();

4
telephony/java/com/android/internal/telephony/gsm/SmsMessage.java
View File

@@ -27,6 +27,7 @@ import static com.android.internal.telephony.SmsConstants.MessageClass;
import android.compat.annotation.UnsupportedAppUsage; import android.compat.annotation.UnsupportedAppUsage;
import android.content.res.Resources; import android.content.res.Resources;
import android.os.Build;
import android.telephony.PhoneNumberUtils; import android.telephony.PhoneNumberUtils;
import android.text.TextUtils; import android.text.TextUtils;
@@ -179,7 +180,8 @@ public class SmsMessage extends SmsMessageBase {
* *
* @hide * @hide
*/ */
@UnsupportedAppUsage @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.Q, publicAlternatives = "Use {@link "
+ "android.telephony.SmsMessage} API instead")
public static SmsMessage createFromEfRecord(int index, byte[] data) { public static SmsMessage createFromEfRecord(int index, byte[] data) {
try { try {
SmsMessage msg = new SmsMessage(); SmsMessage msg = new SmsMessage();