Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 0e79151f authored by Tyler Gunn's avatar Tyler Gunn Committed by android-build-merger
Browse files

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

am: 55c3b4a9

Change-Id: Icb80c34bf81ec882d7da7b47afc7f7853059846e
parents 72f589aa 55c3b4a9

api/current.txt

+1 −1
Original line number Original line Diff line number Diff line
@@ -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_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_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_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_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_LAUNCH_VOICEMAIL_SETTINGS_INTENT = "android.telephony.extra.LAUNCH_VOICEMAIL_SETTINGS_INTENT";

    field public static final String EXTRA_NETWORK_COUNTRY = "android.telephony.extra.NETWORK_COUNTRY";

    field public static final String EXTRA_NETWORK_COUNTRY = "android.telephony.extra.NETWORK_COUNTRY";

telephony/java/android/telephony/TelephonyManager.java

+8 −0
Original line number Original line Diff line number Diff line
@@ -58,6 +58,8 @@ import android.os.SystemProperties; 
import android.os.WorkSource;

import android.os.WorkSource;

import android.provider.Settings.SettingNotFoundException;

import android.provider.Settings.SettingNotFoundException;

import android.service.carrier.CarrierIdentifier;

import android.service.carrier.CarrierIdentifier;

import android.telecom.CallScreeningService;

import android.telecom.InCallService;

import android.telecom.PhoneAccount;

import android.telecom.PhoneAccount;

import android.telecom.PhoneAccountHandle;

import android.telecom.PhoneAccountHandle;

import android.telecom.TelecomManager;

import android.telecom.TelecomManager;
@@ -617,7 +619,13 @@ public class TelephonyManager { 
     * <p class="note">

     * <p class="note">

     * Retrieve with

     * Retrieve with

     * {@link android.content.Intent#getStringExtra(String)}.

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

    public static final String EXTRA_INCOMING_NUMBER = "incoming_number";





    /**

    /**