diff --git a/core/java/android/provider/Telephony.java b/core/java/android/provider/Telephony.java index add03160bbe91..9e454e63c8498 100644 --- a/core/java/android/provider/Telephony.java +++ b/core/java/android/provider/Telephony.java @@ -4154,20 +4154,6 @@ public final class Telephony { */ public static final String CID = "cid"; - /** - * Message code. OBSOLETE: merged into SERIAL_NUMBER. - *
Type: INTEGER
- * @hide - */ - public static final String V1_MESSAGE_CODE = "message_code"; - - /** - * Message identifier. OBSOLETE: renamed to SERVICE_CATEGORY. - *Type: INTEGER
- * @hide - */ - public static final String V1_MESSAGE_IDENTIFIER = "message_id"; - /** * Service category which represents the general topic of the message. *diff --git a/telephony/java/android/telephony/SmsCbMessage.java b/telephony/java/android/telephony/SmsCbMessage.java index c7f952954d5ff..045d1ebb56404 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")