Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Mark EXTRA_INCOMING_NUMBER for PHONE_STATE broadcast as deprecated." am: e2a486a7b2

Browse Source 
am: 55c3b4a993

Change-Id: Icb80c34bf81ec882d7da7b47afc7f7853059846e
This commit is contained in:
Tyler Gunn
2019-03-18 15:58:21 -07:00
committed by android-build-merger
parent 72f589aafd 55c3b4a993
commit 0e79151f2d
2 changed files with 9 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
api/current.txt
View File

@@ -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";

8
telephony/java/android/telephony/TelephonyManager.java
View File

@@ -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";
/**