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

Merge "Delete newFromCMT() and newFromCDS() from SmsMessage" am: b599edc541 am: b403b0877d am: 5850cbdfad am: 57c6c1b17c

Browse Source 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1359205

Change-Id: I30cf7dfd7a7039d8b05be60c365431bdee802b3e
This commit is contained in:
Treehugger Robot
2020-07-10 07:44:36 +00:00
committed by Automerger Merge Worker
parent 7a37a4cb4d 57c6c1b17c
commit 7c2a2c11a6
2 changed files with 0 additions and 54 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -254,28 +254,6 @@ public class SmsMessage {
}
}
/**
* TS 27.005 3.4.1 lines[0] and lines[1] are the two lines read from the
* +CMT unsolicited response (PDU mode, of course)
* +CMT: [&lt;alpha>],<length><CR><LF><pdu>
*
* Only public for debugging and for RIL
*
* {@hide}
*/
public static SmsMessage newFromCMT(byte[] pdu) {
// received SMS in 3GPP format
SmsMessageBase wrappedMessage =
com.android.internal.telephony.gsm.SmsMessage.newFromCMT(pdu);
if (wrappedMessage != null) {
return new SmsMessage(wrappedMessage);
} else {
Rlog.e(LOG_TAG, "newFromCMT(): wrappedMessage is null");
return null;
}
}
/**
* Creates an SmsMessage from an SMS EF record.
*

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

@@ -138,38 +138,6 @@ public class SmsMessage extends SmsMessageBase {
return (mProtocolIdentifier == 0x40);
}
/**
* TS 27.005 3.4.1 lines[0] and lines[1] are the two lines read from the
* +CMT unsolicited response (PDU mode, of course)
* +CMT: [&lt;alpha>],<length><CR><LF><pdu>
*
* Only public for debugging
*
* {@hide}
*/
public static SmsMessage newFromCMT(byte[] pdu) {
try {
SmsMessage msg = new SmsMessage();
msg.parsePdu(pdu);
return msg;
} catch (RuntimeException ex) {
Rlog.e(LOG_TAG, "SMS PDU parsing failed: ", ex);
return null;
}
}
/** @hide */
public static SmsMessage newFromCDS(byte[] pdu) {
try {
SmsMessage msg = new SmsMessage();
msg.parsePdu(pdu);
return msg;
} catch (RuntimeException ex) {
Rlog.e(LOG_TAG, "CDS SMS PDU parsing failed: ", ex);
return null;
}
}
/**
* Creates an SmsMessage from an SMS EF record.
*