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

Commit f4626014 authored by Chen Xu's avatar Chen Xu Committed by android-build-merger
Browse files

Merge "Telephony light grey list clean up for Q" am: 71ca860f 

am: 0daf5ca4

Change-Id: I5c18a432f3cf04f7071334e69c3726bc6775ee51
parents 6b833a4d 0daf5ca4

telephony/java/android/telephony/PhoneStateListener.java

+4 −3
Original line number Diff line number Diff line
@@ -22,6 +22,7 @@ import android.annotation.RequiresPermission; 
import android.annotation.SystemApi;

import android.annotation.UnsupportedAppUsage;

import android.os.Binder;

import android.os.Build;

import android.os.Bundle;

import android.os.Handler;

import android.os.HandlerExecutor;
@@ -343,7 +344,7 @@ public class PhoneStateListener { 
     * using a particular non-null Looper.

     * @hide

     */

    @UnsupportedAppUsage

    @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.P)

    public PhoneStateListener(Looper looper) {

        this(null, looper);

    }
@@ -354,7 +355,7 @@ public class PhoneStateListener { 
     * own non-null Looper use PhoneStateListener(int subId, Looper looper) below.

     * @hide

     */

    @UnsupportedAppUsage

    @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.P)

    public PhoneStateListener(Integer subId) {

        this(subId, Looper.myLooper());

    }
@@ -364,7 +365,7 @@ public class PhoneStateListener { 
     * and non-null Looper.

     * @hide

     */

    @UnsupportedAppUsage

    @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.P)

    public PhoneStateListener(Integer subId, Looper looper) {

        this(subId, new HandlerExecutor(new Handler(looper)));

    }

telephony/java/android/telephony/ServiceState.java

+4 −4
Original line number Diff line number Diff line
@@ -213,7 +213,7 @@ public class ServiceState implements Parcelable { 
     * IWLAN

     * @hide

     */

    @UnsupportedAppUsage

    @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.P)

    public static final int RIL_RADIO_TECHNOLOGY_IWLAN = 18;



    /**
@@ -595,7 +595,7 @@ public class ServiceState implements Parcelable { 
     * @return roaming type

     * @hide

     */

    @UnsupportedAppUsage

    @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.P)

    public @RoamingType int getVoiceRoamingType() {

        final NetworkRegistrationState regState = getNetworkRegistrationState(

                NetworkRegistrationState.DOMAIN_CS, AccessNetworkConstants.TransportType.WWAN);
@@ -634,7 +634,7 @@ public class ServiceState implements Parcelable { 
     * @return roaming type

     * @hide

     */

    @UnsupportedAppUsage

    @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.P)

    public @RoamingType int getDataRoamingType() {

        final NetworkRegistrationState regState = getNetworkRegistrationState(

                NetworkRegistrationState.DOMAIN_PS, AccessNetworkConstants.TransportType.WWAN);
@@ -785,7 +785,7 @@ public class ServiceState implements Parcelable { 
     * @return numeric format of operator, null if unregistered or unknown

     * @hide

     */

    @UnsupportedAppUsage

    @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.P)

    public String getVoiceOperatorNumeric() {

        return mVoiceOperatorNumeric;

    }

telephony/java/android/telephony/TelephonyManager.java

+4 −4
Original line number Diff line number Diff line
@@ -7455,7 +7455,7 @@ public class TelephonyManager { 
     * @see SubscriptionManager#getDefaultSubscriptionId()

     * @hide

     */

    @UnsupportedAppUsage

    @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.P)

    public boolean isImsRegistered() {

       try {

           return getITelephony().isImsRegistered(getSubId());
@@ -7472,7 +7472,7 @@ public class TelephonyManager { 
     * @see SubscriptionManager#getDefaultSubscriptionId()

     * @hide

     */

    @UnsupportedAppUsage

    @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.P)

    public boolean isVolteAvailable() {

        try {

            return getITelephony().isAvailable(getSubId(),
@@ -7491,7 +7491,7 @@ public class TelephonyManager { 
     * @return true if VT is available, or false if it is unavailable or unknown.

     * @hide

     */

    @UnsupportedAppUsage

    @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.P)

    public boolean isVideoTelephonyAvailable() {

        try {

            return getITelephony().isVideoTelephonyAvailable(getSubId());
@@ -7506,7 +7506,7 @@ public class TelephonyManager { 
     * @return true if VoWiFi is available, or false if it is unavailable or unknown.

     * @hide

     */

    @UnsupportedAppUsage

    @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.P)

    public boolean isWifiCallingAvailable() {

       try {

           return getITelephony().isWifiCallingAvailable(getSubId());