diff options
| author | 2019-12-03 19:10:34 +0000 | |
|---|---|---|
| committer | 2019-12-03 19:10:34 +0000 | |
| commit | fe903fb842c8deede5965d888d50ff2c05e9aad5 (patch) | |
| tree | 0f73dc2de14064851d95a7ec6c77adb368ffb941 | |
| parent | 96b3903890784fd5cfa57024a3b95b29ff28ec20 (diff) | |
| parent | 21effc8643d93f6859914a951ad96ebb6cb3aa58 (diff) | |
Merge "Code clean up"
| -rw-r--r-- | core/java/android/provider/Telephony.java | 14 | ||||
| -rw-r--r-- | telephony/java/android/telephony/SmsCbMessage.java | 3 |
2 files changed, 2 insertions, 15 deletions
diff --git a/core/java/android/provider/Telephony.java b/core/java/android/provider/Telephony.java index add03160bbe9..9e454e63c849 100644 --- a/core/java/android/provider/Telephony.java +++ b/core/java/android/provider/Telephony.java @@ -4155,20 +4155,6 @@ public final class Telephony { public static final String CID = "cid"; /** - * Message code. <em>OBSOLETE: merged into SERIAL_NUMBER.</em> - * <P>Type: INTEGER</P> - * @hide - */ - public static final String V1_MESSAGE_CODE = "message_code"; - - /** - * Message identifier. <em>OBSOLETE: renamed to SERVICE_CATEGORY.</em> - * <P>Type: INTEGER</P> - * @hide - */ - public static final String V1_MESSAGE_IDENTIFIER = "message_id"; - - /** * Service category which represents the general topic of the message. * <p> * For GSM/UMTS: message identifier (see 3GPP TS 23.041 section 9.4.1.2.2) diff --git a/telephony/java/android/telephony/SmsCbMessage.java b/telephony/java/android/telephony/SmsCbMessage.java index c7f952954d5f..045d1ebb5640 100644 --- a/telephony/java/android/telephony/SmsCbMessage.java +++ b/telephony/java/android/telephony/SmsCbMessage.java @@ -533,7 +533,8 @@ public final class SmsCbMessage implements Parcelable { + ", priority=" + mPriority + (mEtwsWarningInfo != null ? (", " + mEtwsWarningInfo.toString()) : "") + (mCmasWarningInfo != null ? (", " + mCmasWarningInfo.toString()) : "") - + ", maximumWaitingTime = " + mMaximumWaitTimeSec + + ", maximumWaitingTime=" + mMaximumWaitTimeSec + + ", received time=" + mReceivedTimeMillis + ", slotIndex = " + mSlotIndex + ", geo=" + (mGeometries != null ? CbGeoUtils.encodeGeometriesToString(mGeometries) : "null") |