diff options
| author | 2019-03-18 15:58:21 -0700 | |
|---|---|---|
| committer | 2019-03-18 15:58:21 -0700 | |
| commit | 0e79151f2d77e2596f16b0042802ba3d3916f8c4 (patch) | |
| tree | 8252d666247ffd6fa9dc56a898e39c5a84e71638 | |
| parent | 72f589aafd1382a29139d65c821a4fa1e4c5bd37 (diff) | |
| parent | 55c3b4a993713660f854c92b82f7bbe86ad53a1c (diff) | |
Merge "Mark EXTRA_INCOMING_NUMBER for PHONE_STATE broadcast as deprecated." am: e2a486a7b2
am: 55c3b4a993
Change-Id: Icb80c34bf81ec882d7da7b47afc7f7853059846e
| -rwxr-xr-x | api/current.txt | 2 | ||||
| -rw-r--r-- | telephony/java/android/telephony/TelephonyManager.java | 8 |
2 files changed, 9 insertions, 1 deletions
diff --git a/api/current.txt b/api/current.txt index 1b762b564f19..3a68cc5475bc 100755 --- a/api/current.txt +++ b/api/current.txt @@ -43159,7 +43159,7 @@ package android.telephony { field public static final String EXTRA_CARRIER_ID = "android.telephony.extra.CARRIER_ID"; field public static final String EXTRA_CARRIER_NAME = "android.telephony.extra.CARRIER_NAME"; field public static final String EXTRA_HIDE_PUBLIC_SETTINGS = "android.telephony.extra.HIDE_PUBLIC_SETTINGS"; - field public static final String EXTRA_INCOMING_NUMBER = "incoming_number"; + field @Deprecated public static final String EXTRA_INCOMING_NUMBER = "incoming_number"; field public static final String EXTRA_IS_REFRESH = "android.telephony.extra.IS_REFRESH"; field public static final String EXTRA_LAUNCH_VOICEMAIL_SETTINGS_INTENT = "android.telephony.extra.LAUNCH_VOICEMAIL_SETTINGS_INTENT"; field public static final String EXTRA_NETWORK_COUNTRY = "android.telephony.extra.NETWORK_COUNTRY"; diff --git a/telephony/java/android/telephony/TelephonyManager.java b/telephony/java/android/telephony/TelephonyManager.java index 36fb0202da54..1e24db5caf91 100644 --- a/telephony/java/android/telephony/TelephonyManager.java +++ b/telephony/java/android/telephony/TelephonyManager.java @@ -58,6 +58,8 @@ import android.os.SystemProperties; import android.os.WorkSource; import android.provider.Settings.SettingNotFoundException; import android.service.carrier.CarrierIdentifier; +import android.telecom.CallScreeningService; +import android.telecom.InCallService; import android.telecom.PhoneAccount; import android.telecom.PhoneAccountHandle; import android.telecom.TelecomManager; @@ -617,7 +619,13 @@ public class TelephonyManager { * <p class="note"> * Retrieve with * {@link android.content.Intent#getStringExtra(String)}. + * <p> + * + * @deprecated Companion apps for wearable devices should use the {@link InCallService} API + * to retrieve the phone number for calls instead. Apps performing call screening should use + * the {@link CallScreeningService} API instead. */ + @Deprecated public static final String EXTRA_INCOMING_NUMBER = "incoming_number"; /** |