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

Commit 10ad8b63 authored by Brad Ebinger's avatar Brad Ebinger Committed by android-build-merger
Browse files

Merge "Deprecate redundant IMS APIs in TelephonyManager." am: 8012f3df am:... 

Merge "Deprecate redundant IMS APIs in TelephonyManager." am: 8012f3df am: 2c8a876f am: cf7c905b
am: 5e73ae32

Change-Id: I74a00843013c032dcca9989892fa2b25f812fbcd
parents 28d49244 5e73ae32

api/system-current.txt

+2 −2
Original line number Original line Diff line number Diff line
@@ -8203,7 +8203,7 @@ package android.telephony { 
    method @RequiresPermission(android.Manifest.permission.MODIFY_PHONE_STATE) public boolean disableDataConnectivity();

    method @RequiresPermission(android.Manifest.permission.MODIFY_PHONE_STATE) public boolean disableDataConnectivity();

    method @RequiresPermission(android.Manifest.permission.MODIFY_PHONE_STATE) public boolean enableDataConnectivity();

    method @RequiresPermission(android.Manifest.permission.MODIFY_PHONE_STATE) public boolean enableDataConnectivity();

    method @RequiresPermission(android.Manifest.permission.MODIFY_PHONE_STATE) public boolean enableModemForSlot(int, boolean);

    method @RequiresPermission(android.Manifest.permission.MODIFY_PHONE_STATE) public boolean enableModemForSlot(int, boolean);

    method @RequiresPermission(android.Manifest.permission.MODIFY_PHONE_STATE) public void enableVideoCalling(boolean);

    method @Deprecated @RequiresPermission(android.Manifest.permission.MODIFY_PHONE_STATE) public void enableVideoCalling(boolean);

    method @Nullable @RequiresPermission(android.Manifest.permission.READ_PRIVILEGED_PHONE_STATE) public String getAidForAppType(int);

    method @Nullable @RequiresPermission(android.Manifest.permission.READ_PRIVILEGED_PHONE_STATE) public String getAidForAppType(int);

    method @Deprecated @RequiresPermission(android.Manifest.permission.READ_PRIVILEGED_PHONE_STATE) public java.util.List<android.service.carrier.CarrierIdentifier> getAllowedCarriers(int);

    method @Deprecated @RequiresPermission(android.Manifest.permission.READ_PRIVILEGED_PHONE_STATE) public java.util.List<android.service.carrier.CarrierIdentifier> getAllowedCarriers(int);

    method public java.util.List<java.lang.String> getCarrierPackageNamesForIntent(android.content.Intent);

    method public java.util.List<java.lang.String> getCarrierPackageNamesForIntent(android.content.Intent);
@@ -8250,7 +8250,7 @@ package android.telephony { 
    method @RequiresPermission(android.Manifest.permission.READ_PRIVILEGED_PHONE_STATE) public boolean isPotentialEmergencyNumber(@NonNull String);

    method @RequiresPermission(android.Manifest.permission.READ_PRIVILEGED_PHONE_STATE) public boolean isPotentialEmergencyNumber(@NonNull String);

    method @Deprecated @RequiresPermission(anyOf={android.Manifest.permission.READ_PRIVILEGED_PHONE_STATE, android.Manifest.permission.READ_PHONE_STATE}) public boolean isRadioOn();

    method @Deprecated @RequiresPermission(anyOf={android.Manifest.permission.READ_PRIVILEGED_PHONE_STATE, android.Manifest.permission.READ_PHONE_STATE}) public boolean isRadioOn();

    method @Deprecated @RequiresPermission(anyOf={android.Manifest.permission.READ_PRIVILEGED_PHONE_STATE, android.Manifest.permission.READ_PHONE_STATE}) public boolean isRinging();

    method @Deprecated @RequiresPermission(anyOf={android.Manifest.permission.READ_PRIVILEGED_PHONE_STATE, android.Manifest.permission.READ_PHONE_STATE}) public boolean isRinging();

    method @RequiresPermission(anyOf={android.Manifest.permission.READ_PRIVILEGED_PHONE_STATE, android.Manifest.permission.READ_PHONE_STATE}) public boolean isVideoCallingEnabled();

    method @Deprecated @RequiresPermission(anyOf={android.Manifest.permission.READ_PRIVILEGED_PHONE_STATE, android.Manifest.permission.READ_PHONE_STATE}) public boolean isVideoCallingEnabled();

    method @Deprecated @RequiresPermission(android.Manifest.permission.READ_PHONE_STATE) public boolean isVisualVoicemailEnabled(android.telecom.PhoneAccountHandle);

    method @Deprecated @RequiresPermission(android.Manifest.permission.READ_PHONE_STATE) public boolean isVisualVoicemailEnabled(android.telecom.PhoneAccountHandle);

    method public boolean needsOtaServiceProvisioning();

    method public boolean needsOtaServiceProvisioning();

    method @RequiresPermission(android.Manifest.permission.MODIFY_PHONE_STATE) public boolean rebootRadio();

    method @RequiresPermission(android.Manifest.permission.MODIFY_PHONE_STATE) public boolean rebootRadio();

telephony/java/android/telephony/TelephonyManager.java

+21 −2
Original line number Original line Diff line number Diff line
@@ -67,6 +67,7 @@ import android.telephony.VisualVoicemailService.VisualVoicemailTask; 
import android.telephony.data.ApnSetting;

import android.telephony.data.ApnSetting;

import android.telephony.emergency.EmergencyNumber;

import android.telephony.emergency.EmergencyNumber;

import android.telephony.emergency.EmergencyNumber.EmergencyServiceCategories;

import android.telephony.emergency.EmergencyNumber.EmergencyServiceCategories;

import android.telephony.ims.ImsMmTelManager;

import android.telephony.ims.aidl.IImsConfig;

import android.telephony.ims.aidl.IImsConfig;

import android.telephony.ims.aidl.IImsMmTelFeature;

import android.telephony.ims.aidl.IImsMmTelFeature;

import android.telephony.ims.aidl.IImsRcsFeature;

import android.telephony.ims.aidl.IImsRcsFeature;
@@ -8671,7 +8672,12 @@ public class TelephonyManager { 
        return -1;

        return -1;

    }

    }





    /** @hide */

    /**

     * @deprecated Use {@link android.telephony.ims.ImsMmTelManager#setVtSettingEnabled(boolean)}

     * instead.

     * @hide

     */

    @Deprecated

    @SystemApi

    @SystemApi

    @RequiresPermission(android.Manifest.permission.MODIFY_PHONE_STATE)

    @RequiresPermission(android.Manifest.permission.MODIFY_PHONE_STATE)

    public void enableVideoCalling(boolean enable) {

    public void enableVideoCalling(boolean enable) {
@@ -8684,7 +8690,14 @@ public class TelephonyManager { 
        }

        }

    }

    }





    /** @hide */

    /**

     * @deprecated Use {@link ImsMmTelManager#isVtSettingEnabled()} instead to check if the user

     * has enabled the Video Calling setting, {@link ImsMmTelManager#isAvailable(int, int)} to

     * determine if video calling is available, or {@link ImsMmTelManager#isCapable(int, int)} to

     * determine if video calling is capable.

     * @hide

     */

    @Deprecated

    @SystemApi

    @SystemApi

    @RequiresPermission(anyOf = {

    @RequiresPermission(anyOf = {

            android.Manifest.permission.READ_PRIVILEGED_PHONE_STATE,

            android.Manifest.permission.READ_PRIVILEGED_PHONE_STATE,
@@ -8804,6 +8817,7 @@ public class TelephonyManager { 
     * @param subId Subscription ID

     * @param subId Subscription ID

     * @return true if IMS status is registered, false if the IMS status is not registered or a

     * @return true if IMS status is registered, false if the IMS status is not registered or a

     * RemoteException occurred.

     * RemoteException occurred.

     * Use {@link ImsMmTelManager.RegistrationCallback} instead.

     * @hide

     * @hide

     */

     */

    public boolean isImsRegistered(int subId) {

    public boolean isImsRegistered(int subId) {
@@ -8840,6 +8854,8 @@ public class TelephonyManager { 
     * used during creation, the default subscription ID will be used.

     * used during creation, the default subscription ID will be used.

     * @return true if Voice over LTE is available or false if it is unavailable or unknown.

     * @return true if Voice over LTE is available or false if it is unavailable or unknown.

     * @see SubscriptionManager#getDefaultSubscriptionId()

     * @see SubscriptionManager#getDefaultSubscriptionId()

     * <p>

     * Use {@link ImsMmTelManager#isAvailable(int, int)} instead.

     * @hide

     * @hide

     */

     */

    @UnsupportedAppUsage

    @UnsupportedAppUsage
@@ -8859,6 +8875,7 @@ public class TelephonyManager { 
     * used during creation, the default subscription ID will be used. To query the

     * used during creation, the default subscription ID will be used. To query the

     * underlying technology that VT is available on, use {@link #getImsRegTechnologyForMmTel}.

     * underlying technology that VT is available on, use {@link #getImsRegTechnologyForMmTel}.

     * @return true if VT is available, or false if it is unavailable or unknown.

     * @return true if VT is available, or false if it is unavailable or unknown.

     * Use {@link ImsMmTelManager#isAvailable(int, int)} instead.

     * @hide

     * @hide

     */

     */

    @UnsupportedAppUsage

    @UnsupportedAppUsage
@@ -8874,6 +8891,7 @@ public class TelephonyManager { 
     * Returns the Status of Wi-Fi calling (Voice over WiFi) for the subscription ID specified.

     * Returns the Status of Wi-Fi calling (Voice over WiFi) for the subscription ID specified.

     * @param subId the subscription ID.

     * @param subId the subscription ID.

     * @return true if VoWiFi is available, or false if it is unavailable or unknown.

     * @return true if VoWiFi is available, or false if it is unavailable or unknown.

     * Use {@link ImsMmTelManager#isAvailable(int, int)} instead.

     * @hide

     * @hide

     */

     */

    @UnsupportedAppUsage

    @UnsupportedAppUsage
@@ -8894,6 +8912,7 @@ public class TelephonyManager { 
     *  - {@link ImsRegistrationImplBase#REGISTRATION_TECH_IWLAN} for IWLAN registration, or

     *  - {@link ImsRegistrationImplBase#REGISTRATION_TECH_IWLAN} for IWLAN registration, or

     *  - {@link ImsRegistrationImplBase#REGISTRATION_TECH_NONE} if we are not registered or the

     *  - {@link ImsRegistrationImplBase#REGISTRATION_TECH_NONE} if we are not registered or the

     *  result is unavailable.

     *  result is unavailable.

     *  Use {@link ImsMmTelManager.RegistrationCallback} instead.

     *  @hide

     *  @hide

     */

     */

    public @ImsRegistrationImplBase.ImsRegistrationTech int getImsRegTechnologyForMmTel() {

    public @ImsRegistrationImplBase.ImsRegistrationTech int getImsRegTechnologyForMmTel() {