Merge "Delete newFromCMT() and newFromCDS() from SmsMessage" am: b599edc541
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1359205 Change-Id: If6f43bcd579c4bf6baaf2b973d296c8ba3ac0c82
This commit is contained in:
@@ -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: [<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.
|
* Creates an SmsMessage from an SMS EF record.
|
||||||
*
|
*
|
||||||
|
|||||||
@@ -139,38 +139,6 @@ public class SmsMessage extends SmsMessageBase {
|
|||||||
return (mProtocolIdentifier == 0x40);
|
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: [<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.
|
* Creates an SmsMessage from an SMS EF record.
|
||||||
*
|
*
|
||||||
|
|||||||
Reference in New Issue
Block a user