diff options
| author | 2017-04-15 06:07:25 +0000 | |
|---|---|---|
| committer | 2017-04-15 06:07:27 +0000 | |
| commit | 24299f5b065aa1013f29e37e05fb0d31285627c7 (patch) | |
| tree | 6f11c82d76110d01f586d1288f2540691aa6437c | |
| parent | 02278a5a021c221bb7c26a59a9c6e3541e9a52a1 (diff) | |
| parent | 27a83fe5479f1b1b879d12dd3087575ee977a403 (diff) | |
Merge "Expose phone account register/unregister intents."
| -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 b29f4f67ff0d..4b837d6c15a7 100644 --- a/api/current.txt +++ b/api/current.txt @@ -37478,6 +37478,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 f034502f69e0..755d1b9291c4 100644 --- a/api/test-current.txt +++ b/api/test-current.txt @@ -37577,6 +37577,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 94c3dfe59311..bcd01a76a8ab 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"; |