diff options
| author | 2017-04-17 17:40:44 +0000 | |
|---|---|---|
| committer | 2017-04-17 17:40:50 +0000 | |
| commit | 790ec07c261e0d696be9aa07a7249bb82aa0e87f (patch) | |
| tree | 860a8133e44be6a0609ea17c423d2900c6e26000 | |
| parent | 628690ea2b1ad16e929340296dab1eef8da5be4e (diff) | |
| parent | 346892ff9fe3af7e2856cda9bb3cc8e2d88ad6b9 (diff) | |
Merge "DO NOT MERGE Expose phone account register/unregister intents." into oc-dev
| -rw-r--r-- | api/current.txt | 2 | ||||
| -rw-r--r-- | api/test-current.txt | 2 | ||||
| -rw-r--r-- | telecomm/java/android/telecom/TelecomManager.java | 22 |
3 files changed, 18 insertions, 8 deletions
diff --git a/api/current.txt b/api/current.txt index 0cc436185209..da601e1519a8 100644 --- a/api/current.txt +++ b/api/current.txt @@ -39473,6 +39473,8 @@ package android.telecom { field public static final java.lang.String ACTION_CONFIGURE_PHONE_ACCOUNT = "android.telecom.action.CONFIGURE_PHONE_ACCOUNT"; field public static final java.lang.String ACTION_DEFAULT_DIALER_CHANGED = "android.telecom.action.DEFAULT_DIALER_CHANGED"; field public static final deprecated java.lang.String ACTION_INCOMING_CALL = "android.telecom.action.INCOMING_CALL"; + field public static final java.lang.String ACTION_PHONE_ACCOUNT_REGISTERED = "android.telecom.action.PHONE_ACCOUNT_REGISTERED"; + field public static final java.lang.String ACTION_PHONE_ACCOUNT_UNREGISTERED = "android.telecom.action.PHONE_ACCOUNT_UNREGISTERED"; field public static final java.lang.String ACTION_SHOW_CALL_ACCESSIBILITY_SETTINGS = "android.telecom.action.SHOW_CALL_ACCESSIBILITY_SETTINGS"; field public static final java.lang.String ACTION_SHOW_CALL_SETTINGS = "android.telecom.action.SHOW_CALL_SETTINGS"; field public static final java.lang.String ACTION_SHOW_MISSED_CALLS_NOTIFICATION = "android.telecom.action.SHOW_MISSED_CALLS_NOTIFICATION"; diff --git a/api/test-current.txt b/api/test-current.txt index 18f86b836b97..bd2fed09c9d6 100644 --- a/api/test-current.txt +++ b/api/test-current.txt @@ -39667,6 +39667,8 @@ package android.telecom { field public static final java.lang.String ACTION_CONFIGURE_PHONE_ACCOUNT = "android.telecom.action.CONFIGURE_PHONE_ACCOUNT"; field public static final java.lang.String ACTION_DEFAULT_DIALER_CHANGED = "android.telecom.action.DEFAULT_DIALER_CHANGED"; field public static final deprecated java.lang.String ACTION_INCOMING_CALL = "android.telecom.action.INCOMING_CALL"; + field public static final java.lang.String ACTION_PHONE_ACCOUNT_REGISTERED = "android.telecom.action.PHONE_ACCOUNT_REGISTERED"; + field public static final java.lang.String ACTION_PHONE_ACCOUNT_UNREGISTERED = "android.telecom.action.PHONE_ACCOUNT_UNREGISTERED"; field public static final java.lang.String ACTION_SHOW_CALL_ACCESSIBILITY_SETTINGS = "android.telecom.action.SHOW_CALL_ACCESSIBILITY_SETTINGS"; field public static final java.lang.String ACTION_SHOW_CALL_SETTINGS = "android.telecom.action.SHOW_CALL_SETTINGS"; field public static final java.lang.String ACTION_SHOW_MISSED_CALLS_NOTIFICATION = "android.telecom.action.SHOW_MISSED_CALLS_NOTIFICATION"; diff --git a/telecomm/java/android/telecom/TelecomManager.java b/telecomm/java/android/telecom/TelecomManager.java index 1874d8d04723..0342da7aa6ef 100644 --- a/telecomm/java/android/telecom/TelecomManager.java +++ b/telecomm/java/android/telecom/TelecomManager.java @@ -112,20 +112,26 @@ public class TelecomManager { "android.telecom.action.CHANGE_PHONE_ACCOUNTS"; /** - * The {@link android.content.Intent} action used indicate that a new phone account was - * just registered. - * @hide + * {@link android.content.Intent} action used indicate that a new phone account was just + * registered. + * <p> + * The Intent {@link Intent#getExtras() extras} will contain {@link #EXTRA_PHONE_ACCOUNT_HANDLE} + * to indicate which {@link PhoneAccount} was registered. + * <p> + * Will only be sent to the default dialer app (see {@link #getDefaultDialerPackage()}). */ - @SystemApi public static final String ACTION_PHONE_ACCOUNT_REGISTERED = "android.telecom.action.PHONE_ACCOUNT_REGISTERED"; /** - * The {@link android.content.Intent} action used indicate that a phone account was - * just unregistered. - * @hide + * {@link android.content.Intent} action used indicate that a phone account was just + * unregistered. + * <p> + * The Intent {@link Intent#getExtras() extras} will contain {@link #EXTRA_PHONE_ACCOUNT_HANDLE} + * to indicate which {@link PhoneAccount} was unregistered. + * <p> + * Will only be sent to the default dialer app (see {@link #getDefaultDialerPackage()}). */ - @SystemApi public static final String ACTION_PHONE_ACCOUNT_UNREGISTERED = "android.telecom.action.PHONE_ACCOUNT_UNREGISTERED"; |