Merge "Expose a meta-data value to allow dialer ringing" (ee4c5c9e) · Commits · e / os / android_frameworks_base

api/current.txt

+2 −0

Original line number	Diff line number	Diff line
		@@ -35611,6 +35611,7 @@ package android.telecom {
		method public void onCallAudioStateChanged(android.telecom.CallAudioState);
		method public void onCallRemoved(android.telecom.Call);
		method public void onCanAddCallChanged(boolean);
		method public void onSilenceRinger();
		method public final void setAudioRoute(int);
		method public final void setMuted(boolean);
		field public static final java.lang.String SERVICE_INTERFACE = "android.telecom.InCallService";
		@@ -35871,6 +35872,7 @@ package android.telecom {
		field public static final java.lang.String EXTRA_START_CALL_WITH_VIDEO_STATE = "android.telecom.extra.START_CALL_WITH_VIDEO_STATE";
		field public static final java.lang.String GATEWAY_ORIGINAL_ADDRESS = "android.telecom.extra.GATEWAY_ORIGINAL_ADDRESS";
		field public static final java.lang.String GATEWAY_PROVIDER_PACKAGE = "android.telecom.extra.GATEWAY_PROVIDER_PACKAGE";
		field public static final java.lang.String METADATA_IN_CALL_SERVICE_RINGING = "android.telecom.IN_CALL_SERVICE_RINGING";
		field public static final java.lang.String METADATA_IN_CALL_SERVICE_UI = "android.telecom.IN_CALL_SERVICE_UI";
		field public static final int PRESENTATION_ALLOWED = 1; // 0x1
		field public static final int PRESENTATION_PAYPHONE = 4; // 0x4

api/system-current.txt

+3 −0

Original line number	Diff line number	Diff line
		@@ -37928,6 +37928,7 @@ package android.telecom {
		method public void onCanAddCallChanged(boolean);
		method public deprecated void onPhoneCreated(android.telecom.Phone);
		method public deprecated void onPhoneDestroyed(android.telecom.Phone);
		method public void onSilenceRinger();
		method public final void setAudioRoute(int);
		method public final void setMuted(boolean);
		field public static final java.lang.String SERVICE_INTERFACE = "android.telecom.InCallService";
		@@ -38009,6 +38010,7 @@ package android.telecom {
		method public void onCallAudioStateChanged(android.telecom.Phone, android.telecom.CallAudioState);
		method public void onCallRemoved(android.telecom.Phone, android.telecom.Call);
		method public void onCanAddCallChanged(android.telecom.Phone, boolean);
		method public void onSilenceRinger(android.telecom.Phone);
		}

		public final class PhoneAccount implements android.os.Parcelable {
		@@ -38268,6 +38270,7 @@ package android.telecom {
		field public static final java.lang.String EXTRA_START_CALL_WITH_VIDEO_STATE = "android.telecom.extra.START_CALL_WITH_VIDEO_STATE";
		field public static final java.lang.String GATEWAY_ORIGINAL_ADDRESS = "android.telecom.extra.GATEWAY_ORIGINAL_ADDRESS";
		field public static final java.lang.String GATEWAY_PROVIDER_PACKAGE = "android.telecom.extra.GATEWAY_PROVIDER_PACKAGE";
		field public static final java.lang.String METADATA_IN_CALL_SERVICE_RINGING = "android.telecom.IN_CALL_SERVICE_RINGING";
		field public static final java.lang.String METADATA_IN_CALL_SERVICE_UI = "android.telecom.IN_CALL_SERVICE_UI";
		field public static final int PRESENTATION_ALLOWED = 1; // 0x1
		field public static final int PRESENTATION_PAYPHONE = 4; // 0x4

api/test-current.txt

+2 −0

Original line number	Diff line number	Diff line
		@@ -35625,6 +35625,7 @@ package android.telecom {
		method public void onCallAudioStateChanged(android.telecom.CallAudioState);
		method public void onCallRemoved(android.telecom.Call);
		method public void onCanAddCallChanged(boolean);
		method public void onSilenceRinger();
		method public final void setAudioRoute(int);
		method public final void setMuted(boolean);
		field public static final java.lang.String SERVICE_INTERFACE = "android.telecom.InCallService";
		@@ -35885,6 +35886,7 @@ package android.telecom {
		field public static final java.lang.String EXTRA_START_CALL_WITH_VIDEO_STATE = "android.telecom.extra.START_CALL_WITH_VIDEO_STATE";
		field public static final java.lang.String GATEWAY_ORIGINAL_ADDRESS = "android.telecom.extra.GATEWAY_ORIGINAL_ADDRESS";
		field public static final java.lang.String GATEWAY_PROVIDER_PACKAGE = "android.telecom.extra.GATEWAY_PROVIDER_PACKAGE";
		field public static final java.lang.String METADATA_IN_CALL_SERVICE_RINGING = "android.telecom.IN_CALL_SERVICE_RINGING";
		field public static final java.lang.String METADATA_IN_CALL_SERVICE_UI = "android.telecom.IN_CALL_SERVICE_UI";
		field public static final int PRESENTATION_ALLOWED = 1; // 0x1
		field public static final int PRESENTATION_PAYPHONE = 4; // 0x4

telecomm/java/android/telecom/InCallService.java

+21 −0

Original line number	Diff line number	Diff line
		@@ -73,6 +73,7 @@ public abstract class InCallService extends Service {
		private static final int MSG_ON_CALL_AUDIO_STATE_CHANGED = 5;
		private static final int MSG_BRING_TO_FOREGROUND = 6;
		private static final int MSG_ON_CAN_ADD_CALL_CHANGED = 7;
		private static final int MSG_SILENCE_RINGER = 8;

		/** Default Handler used to consolidate binder method calls onto a single thread. */
		private final Handler mHandler = new Handler(Looper.getMainLooper()) {
		@@ -114,6 +115,9 @@ public abstract class InCallService extends Service {
		case MSG_ON_CAN_ADD_CALL_CHANGED:
		mPhone.internalSetCanAddCall(msg.arg1 == 1);
		break;
		case MSG_SILENCE_RINGER:
		mPhone.internalSilenceRinger();
		break;
		default:
		break;
		}
		@@ -165,6 +169,11 @@ public abstract class InCallService extends Service {
		mHandler.obtainMessage(MSG_ON_CAN_ADD_CALL_CHANGED, canAddCall ? 1 : 0, 0)
		.sendToTarget();
		}

		@Override
		public void silenceRinger() {
		mHandler.obtainMessage(MSG_SILENCE_RINGER).sendToTarget();
		}
		}

		private Phone.Listener mPhoneListener = new Phone.Listener() {
		@@ -202,6 +211,12 @@ public abstract class InCallService extends Service {
		InCallService.this.onCanAddCallChanged(canAddCall);
		}

		/** ${inheritDoc} */
		@Override
		public void onSilenceRinger(Phone phone) {
		InCallService.this.onSilenceRinger();
		}

		};

		private Phone mPhone;
		@@ -404,6 +419,12 @@ public abstract class InCallService extends Service {
		public void onCanAddCallChanged(boolean canAddCall) {
		}

		/**
		* Called to silence the ringer if a ringing call exists.
		*/
		public void onSilenceRinger() {
		}

		/**
		* Used to issue commands to the {@link Connection.VideoProvider} associated with a
		* {@link Call}.

telecomm/java/android/telecom/Phone.java

+17 −0

Original line number	Diff line number	Diff line
		@@ -97,6 +97,13 @@ public final class Phone {
		* @param canAddCall Indicates whether an additional call can be added.
		*/
		public void onCanAddCallChanged(Phone phone, boolean canAddCall) { }

		/**
		* Called to silence the ringer if a ringing call exists.
		*
		* @param phone The {@code Phone} calling this method.
		*/
		public void onSilenceRinger(Phone phone) { }
		}

		// A Map allows us to track each Call by its Telecom-specified call ID
		@@ -179,6 +186,10 @@ public final class Phone {
		}
		}

		final void internalSilenceRinger() {
		fireSilenceRinger();
		}

		/**
		* Called to destroy the phone and cleanup any lingering calls.
		*/
		@@ -330,6 +341,12 @@ public final class Phone {
		}
		}

		private void fireSilenceRinger() {
		for (Listener listener : mListeners) {
		listener.onSilenceRinger(this);
		}
		}

		private void checkCallTree(ParcelableCall parcelableCall) {
		if (parcelableCall.getParentCallId() != null &&
		!mCallByTelecomCallId.containsKey(parcelableCall.getParentCallId())) {