Merge 9ee958cec9b3f3fa74e1558976bad76be12ac755 on remote branch (14030e8c) · Commits · e / os / android_frameworks_opt_telephony

src/java/android/telephony/CellBroadcastMessage.java

+2 −0

Original line number	Diff line number	Diff line
		@@ -90,6 +90,7 @@ public class CellBroadcastMessage implements Parcelable {
		mSmsCbMessage = new SmsCbMessage(in);
		mDeliveryTime = in.readLong();
		mIsRead = (in.readInt() != 0);
		mSubId = in.readInt();
		}

		/** Parcelable: no special flags. */
		@@ -103,6 +104,7 @@ public class CellBroadcastMessage implements Parcelable {
		mSmsCbMessage.writeToParcel(out, flags);
		out.writeLong(mDeliveryTime);
		out.writeInt(mIsRead ? 1 : 0);
		out.writeInt(mSubId);
		}

		public static final Parcelable.Creator<CellBroadcastMessage> CREATOR

+16 −0

Original line number	Diff line number	Diff line
		@@ -81,6 +81,21 @@ public class CallDetails {
		* Phone.CALL_TYPE_SMS;SMS Type
		*/

		public static final int CALL_TYPE_VT_PAUSE = 6; /*
		* Indicates that video is paused;
		* This is an internal call type.
		* The type is used by TeleService and
		* InCallUI only. See CALL_TYPE_VT_RESUME
		*/

		public static final int CALL_TYPE_VT_RESUME = 7; /*
		* This is an internal call
		* type. VT_RESUME call
		* type is used to send
		* unpause request to
		* TeleService.
		*/

		public static final int CALL_TYPE_UNKNOWN = 10; /*
		* Phone.CALL_TYPE_UNKNOWN;
		* Unknown Call type, may be
		@@ -98,6 +113,7 @@ public class CallDetails {
		* not yet selected a
		* domain for a call
		*/

		public static final int CALL_DOMAIN_CS = 1; /*
		* Phone.CALL_DOMAIN_CS; Circuit
		* switched domain