Merge "Fix to prevent CTS failures." (795d3cc2) · Commits · e / os / android_frameworks_base

telecomm/java/android/telecom/ConnectionRequest.java

+4 −1

Original line number	Diff line number	Diff line
		@@ -28,7 +28,7 @@ import android.os.Parcelable;
		public final class ConnectionRequest implements Parcelable {

		// TODO: Token to limit recursive invocations
		private final PhoneAccountHandle mAccountHandle;
		private PhoneAccountHandle mAccountHandle;
		private final Uri mAddress;
		private final Bundle mExtras;
		private final int mVideoState;
		@@ -74,6 +74,9 @@ public final class ConnectionRequest implements Parcelable {
		*/
		public PhoneAccountHandle getAccountHandle() { return mAccountHandle; }

		/** {@hide} */
		public void setAccountHandle(PhoneAccountHandle acc) { mAccountHandle = acc; }

		/**
		* The handle (e.g., phone number) to which the {@link Connection} is to connect.
		*/

+3 −0

Original line number	Diff line number	Diff line
		@@ -644,6 +644,9 @@ public class TelephonyManager {
		*/
		public static final String VVM_TYPE_CVVM = "vvm_type_cvvm";

		/** {@hide} */
		public static final String EMR_DIAL_ACCOUNT = "emr_dial_account";

		//
		//
		// Device Info