Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 03123839 authored Jun 09, 2015 by Yorke Lee Committed by Android (Google) Code Review Jun 09, 2015

Merge "Rename TelecomManager.EXTRA_INCOMING_CALL_ADDRESS" into mnc-dev

parents eac27519 02fb5bc5

api/current.txt

+1 −1

Original line number	Diff line number	Diff line
		@@ -30610,8 +30610,8 @@ package android.telecom {
		field public static final java.lang.String EXTRA_CALL_DISCONNECT_CAUSE = "android.telecom.extra.CALL_DISCONNECT_CAUSE";
		field public static final java.lang.String EXTRA_CALL_DISCONNECT_MESSAGE = "android.telecom.extra.CALL_DISCONNECT_MESSAGE";
		field public static final java.lang.String EXTRA_CHANGE_DEFAULT_DIALER_PACKAGE_NAME = "android.telecom.extra.CHANGE_DEFAULT_DIALER_PACKAGE_NAME";
		field public static final java.lang.String EXTRA_INCOMING_CALL_ADDRESS = "android.telecom.extra.INCOMING_CALL_ADDRESS";
		field public static final java.lang.String EXTRA_INCOMING_CALL_EXTRAS = "android.telecom.extra.INCOMING_CALL_EXTRAS";
		field public static final java.lang.String EXTRA_INCOMING_CALL_HANDLE = "android.telecom.extra.INCOMING_CALL_HANDLE";
		field public static final java.lang.String EXTRA_OUTGOING_CALL_EXTRAS = "android.telecom.extra.OUTGOING_CALL_EXTRAS";
		field public static final java.lang.String EXTRA_PHONE_ACCOUNT_HANDLE = "android.telecom.extra.PHONE_ACCOUNT_HANDLE";
		field public static final java.lang.String EXTRA_START_CALL_WITH_SPEAKERPHONE = "android.telecom.extra.START_CALL_WITH_SPEAKERPHONE";

api/system-current.txt

+1 −1

Original line number	Diff line number	Diff line
		@@ -32824,8 +32824,8 @@ package android.telecom {
		field public static final java.lang.String EXTRA_CALL_DISCONNECT_MESSAGE = "android.telecom.extra.CALL_DISCONNECT_MESSAGE";
		field public static final java.lang.String EXTRA_CHANGE_DEFAULT_DIALER_PACKAGE_NAME = "android.telecom.extra.CHANGE_DEFAULT_DIALER_PACKAGE_NAME";
		field public static final java.lang.String EXTRA_CONNECTION_SERVICE = "android.telecom.extra.CONNECTION_SERVICE";
		field public static final java.lang.String EXTRA_INCOMING_CALL_ADDRESS = "android.telecom.extra.INCOMING_CALL_ADDRESS";
		field public static final java.lang.String EXTRA_INCOMING_CALL_EXTRAS = "android.telecom.extra.INCOMING_CALL_EXTRAS";
		field public static final java.lang.String EXTRA_INCOMING_CALL_HANDLE = "android.telecom.extra.INCOMING_CALL_HANDLE";
		field public static final java.lang.String EXTRA_OUTGOING_CALL_EXTRAS = "android.telecom.extra.OUTGOING_CALL_EXTRAS";
		field public static final java.lang.String EXTRA_PHONE_ACCOUNT_HANDLE = "android.telecom.extra.PHONE_ACCOUNT_HANDLE";
		field public static final java.lang.String EXTRA_START_CALL_WITH_SPEAKERPHONE = "android.telecom.extra.START_CALL_WITH_SPEAKERPHONE";

telecomm/java/android/telecom/TelecomManager.java

+2 −2

Original line number	Diff line number	Diff line
		@@ -162,8 +162,8 @@ public class TelecomManager {
		* The extra used by a {@link ConnectionService} to provide the handle of the caller that
		* has initiated a new incoming call.
		*/
		public static final String EXTRA_INCOMING_CALL_HANDLE =
		"android.telecom.extra.INCOMING_CALL_HANDLE";
		public static final String EXTRA_INCOMING_CALL_ADDRESS =
		"android.telecom.extra.INCOMING_CALL_ADDRESS";

		/**
		* Optional extra for {@link #ACTION_INCOMING_CALL} containing a {@link Bundle} which contains