Merge "Code clean up" (fe903fb8) · Commits · e / os / android_frameworks_base

core/java/android/provider/Telephony.java

+0 −14

Original line number	Diff line number	Diff line
		@@ -4154,20 +4154,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>

+2 −1

Original line number	Diff line number	Diff line
		@@ -534,6 +534,7 @@ public final class SmsCbMessage implements Parcelable {
		+ (mEtwsWarningInfo != null ? (", " + mEtwsWarningInfo.toString()) : "")
		+ (mCmasWarningInfo != null ? (", " + mCmasWarningInfo.toString()) : "")
		+ ", maximumWaitingTime=" + mMaximumWaitTimeSec
		+ ", received time=" + mReceivedTimeMillis
		+ ", slotIndex = " + mSlotIndex
		+ ", geo=" + (mGeometries != null
		? CbGeoUtils.encodeGeometriesToString(mGeometries) : "null")