1 files changed, 4 insertions, 43 deletions
diff --git a/telecomm/java/android/telecom/TelecomManager.java b/telecomm/java/android/telecom/TelecomManager.java
index 07176b3..fb0ecb0 100644
--- a/telecomm/java/android/telecom/TelecomManager.java
+++ b/telecomm/java/android/telecom/TelecomManager.java
@@ -124,33 +124,6 @@ public class TelecomManager {
             "android.telecom.action.CHANGE_DEFAULT_DIALER";
 
     /**
-     * Privileged version of {@link #ACTION_CHANGE_DEFAULT_DIALER} that doesn't require
-     * confirmation from the user via the dialog.
-     *
-     * Requires permission: {@link android.Manifest.permission#MODIFY_PHONE_STATE}
-     * @hide
-     */
-    public static final String ACTION_CHANGE_DEFAULT_DIALER_PRIVILEGED =
-            "android.telecom.action.CHANGE_DEFAULT_DIALER_PRIVILEGED";
-
-    /**
-     * Activity action: Opens the settings screen where a user can enable and disable which
-     * {@link PhoneAccount}s are allows to make and receive calls. Because a user must
-     * explicitly enable an account before the system will use it, an app may want to send the
-     * user to this setting after registering a {@link PhoneAccount}.
-     * <p>
-     * Input: get*Extra field {@link #EXTRA_PHONE_ACCOUNT_DESCRIPTION} contains a string-based
-     * reference to the {@link PhoneAccountHandle} you want to enable. get*Extra field
-     * {@link #EXTRA_ENABLE_PHONE_ACCOUNT_VALUE} contains a boolean value indicated whether
-     * the account should be enabled or disabled.
-     * <p>
-     * Requires permission: {@link android.Manifest.permission#MODIFY_PHONE_STATE}
-     * @hide
-     */
-    public static final String ACTION_ENABLE_PHONE_ACCOUNT_SETTING =
-            "android.telecom.action.ENABLE_PHONE_ACCOUNT_SETTING";
-
-    /**
      * Extra value used to provide the package name for {@link #ACTION_CHANGE_DEFAULT_DIALER}.
      */
     public static final String EXTRA_CHANGE_DEFAULT_DIALER_PACKAGE_NAME =
@@ -186,23 +159,11 @@ public class TelecomManager {
             "android.telecom.extra.PHONE_ACCOUNT_HANDLE";
 
     /**
-     * The extra used with {@link #ACTION_ENABLE_PHONE_ACCOUNT_SETTING} to specify a phone account
-     * as a string value. The value is of the form: "A;B" where A is the component name of the
-     * {@link PhoneAccount} (e.g.,
-     * com.android.phone/com.android.services.telephony.TelephonyConnectionService) and B is the
-     * {@link PhoneAccount} ID.
-     * @hide
-     */
-    public static final String EXTRA_PHONE_ACCOUNT_DESCRIPTION =
-            "android.telecom.extra.PHONE_ACCOUNT_DESCRIPTION";
-
-    /**
-     * Boolean extra used to specify a value for enabling and disabling a phone account.
-     * Used with {@link #ACTION_ENABLE_PHONE_ACCOUNT_SETTING}.
-     * @hide
+     * 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_ENABLE_PHONE_ACCOUNT_VALUE =
-            "android.telecom.extra.ENABLE_PHONE_ACCOUNT_VALUE";
+    public static final String EXTRA_INCOMING_CALL_HANDLE =
+            "android.telecom.extra.INCOMING_CALL_HANDLE";
 
     /**
      * Optional extra for {@link #ACTION_INCOMING_CALL} containing a {@link Bundle} which contains