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

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

Merge "Revert "Telephony light grey list clean up for Q"" am: a18e0957 

am: c16c2f7c

Change-Id: I17fee4991fbe3a8987710be55e73898c1abebe82
parents 76819cc0 c16c2f7c

telecomm/java/android/telecom/TelecomManager.java

+1 −1
Original line number Diff line number Diff line
@@ -676,7 +676,7 @@ public class TelecomManager { 
    /**

     * @hide

     */

    @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.P)

    @UnsupportedAppUsage

    public static TelecomManager from(Context context) {

        return (TelecomManager) context.getSystemService(Context.TELECOM_SERVICE);

    }

telephony/java/android/telephony/ServiceState.java

+7 −8
Original line number Diff line number Diff line
@@ -21,7 +21,6 @@ import android.annotation.SystemApi; 
import android.annotation.TestApi;

import android.annotation.UnsupportedAppUsage;

import android.content.Intent;

import android.os.Build;

import android.os.Bundle;

import android.os.Parcel;

import android.os.Parcelable;
@@ -247,7 +246,7 @@ public class ServiceState implements Parcelable { 
    private String mDataOperatorAlphaLong;

    private String mDataOperatorAlphaShort;

    private String mDataOperatorNumeric;

    @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.P)

    @UnsupportedAppUsage

    private boolean mIsManualNetworkSelection;



    private boolean mIsEmergencyOnly;
@@ -257,9 +256,9 @@ public class ServiceState implements Parcelable { 


    @UnsupportedAppUsage

    private boolean mCssIndicator;

    @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.P)

    @UnsupportedAppUsage

    private int mNetworkId;

    @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.P)

    @UnsupportedAppUsage

    private int mSystemId;

    @UnsupportedAppUsage

    private int mCdmaRoamingIndicator;
@@ -457,7 +456,7 @@ public class ServiceState implements Parcelable { 
     *

     * @hide

     */

    @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.P)

    @UnsupportedAppUsage

    public int getVoiceRegState() {

        return mVoiceRegState;

    }
@@ -472,7 +471,7 @@ public class ServiceState implements Parcelable { 
     *

     * @hide

     */

    @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.P)

    @UnsupportedAppUsage

    public int getDataRegState() {

        return mDataRegState;

    }
@@ -533,7 +532,7 @@ public class ServiceState implements Parcelable { 
     * @return roaming status

     * @hide

     */

    @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.P)

    @UnsupportedAppUsage

    public boolean getVoiceRoaming() {

        return getVoiceRoamingType() != ROAMING_TYPE_NOT_ROAMING;

    }
@@ -557,7 +556,7 @@ public class ServiceState implements Parcelable { 
     * @return roaming type

     * @hide

     */

    @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.P)

    @UnsupportedAppUsage

    public boolean getDataRoaming() {

        return getDataRoamingType() != ROAMING_TYPE_NOT_ROAMING;

    }

telephony/java/android/telephony/SubscriptionManager.java

+3 −4
Original line number Diff line number Diff line
@@ -43,7 +43,6 @@ import android.database.ContentObserver; 
import android.net.INetworkPolicyManager;

import android.net.NetworkCapabilities;

import android.net.Uri;

import android.os.Build;

import android.os.Handler;

import android.os.Looper;

import android.os.Message;
@@ -1368,7 +1367,7 @@ public class SubscriptionManager { 
    }



    /** @hide */

    @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.P)

    @UnsupportedAppUsage

    public static int getPhoneId(int subId) {

        if (!isValidSubscriptionId(subId)) {

            if (DBG) {
@@ -1664,7 +1663,7 @@ public class SubscriptionManager { 
     * usable subId means its neither a INVALID_SUBSCRIPTION_ID nor a DEFAULT_SUB_ID.

     * @hide

     */

    @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.P)

    @UnsupportedAppUsage

    public static boolean isUsableSubIdValue(int subId) {

        return subId >= MIN_SUBSCRIPTION_ID_VALUE && subId <= MAX_SUBSCRIPTION_ID_VALUE;

    }
@@ -1682,7 +1681,7 @@ public class SubscriptionManager { 
    }



    /** @hide */

    @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.P)

    @UnsupportedAppUsage

    public static void putPhoneIdAndSubIdExtra(Intent intent, int phoneId) {

        int[] subIds = SubscriptionManager.getSubId(phoneId);

        if (subIds != null && subIds.length > 0) {

telephony/java/android/telephony/TelephonyManager.java

+16 −18
Original line number Diff line number Diff line
@@ -41,7 +41,6 @@ import android.net.NetworkStats; 
import android.net.Uri;

import android.os.AsyncTask;

import android.os.BatteryStats;

import android.os.Build;

import android.os.Bundle;

import android.os.Handler;

import android.os.PersistableBundle;
@@ -231,8 +230,7 @@ public class TelephonyManager { 


    /** @hide

    /* @deprecated - use getSystemService as described above */

    @Deprecated

    @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.P)

    @UnsupportedAppUsage

    public static TelephonyManager getDefault() {

        return sInstance;

    }
@@ -321,7 +319,7 @@ public class TelephonyManager { 
    }



    /** {@hide} */

    @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.P)

    @UnsupportedAppUsage

    public static TelephonyManager from(Context context) {

        return (TelephonyManager) context.getSystemService(Context.TELEPHONY_SERVICE);

    }
@@ -1880,7 +1878,7 @@ public class TelephonyManager { 
     * @param subId

     * @hide

     */

    @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.P)

    @UnsupportedAppUsage

    public String getNetworkOperatorName(int subId) {

        int phoneId = SubscriptionManager.getPhoneId(subId);

        return getTelephonyProperty(phoneId, TelephonyProperties.PROPERTY_OPERATOR_ALPHA, "");
@@ -1908,7 +1906,7 @@ public class TelephonyManager { 
     * @param subId

     * @hide

     */

    @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.P)

    @UnsupportedAppUsage

    public String getNetworkOperator(int subId) {

        int phoneId = SubscriptionManager.getPhoneId(subId);

        return getNetworkOperatorForPhone(phoneId);
@@ -2232,7 +2230,7 @@ public class TelephonyManager { 
     * @hide

     */

    @RequiresPermission(android.Manifest.permission.READ_PHONE_STATE)

    @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.P)

    @UnsupportedAppUsage

    public int getDataNetworkType(int subId) {

        try{

            ITelephony telephony = getITelephony();
@@ -2268,7 +2266,7 @@ public class TelephonyManager { 
     * @hide

     */

    @RequiresPermission(android.Manifest.permission.READ_PHONE_STATE)

    @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.P)

    @UnsupportedAppUsage

    public int getVoiceNetworkType(int subId) {

        try{

            ITelephony telephony = getITelephony();
@@ -2751,7 +2749,7 @@ public class TelephonyManager { 
     * @param subId for which SimOperator is returned

     * @hide

     */

    @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.P)

    @UnsupportedAppUsage

    public String getSimOperator(int subId) {

        return getSimOperatorNumeric(subId);

    }
@@ -2765,7 +2763,7 @@ public class TelephonyManager { 
     * @see #getSimState

     * @hide

     */

    @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.P)

    @UnsupportedAppUsage

    public String getSimOperatorNumeric() {

        int subId = mSubId;

        if (!SubscriptionManager.isUsableSubIdValue(subId)) {
@@ -2794,7 +2792,7 @@ public class TelephonyManager { 
     * @param subId for which SimOperator is returned

     * @hide

     */

    @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.P)

    @UnsupportedAppUsage

    public String getSimOperatorNumeric(int subId) {

        int phoneId = SubscriptionManager.getPhoneId(subId);

        return getSimOperatorNumericForPhone(phoneId);
@@ -2808,7 +2806,7 @@ public class TelephonyManager { 
     * @param phoneId for which SimOperator is returned

     * @hide

     */

    @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.P)

    @UnsupportedAppUsage

    public String getSimOperatorNumericForPhone(int phoneId) {

        return getTelephonyProperty(phoneId,

                TelephonyProperties.PROPERTY_ICC_OPERATOR_NUMERIC, "");
@@ -2835,7 +2833,7 @@ public class TelephonyManager { 
     * @param subId for which SimOperatorName is returned

     * @hide

     */

    @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.P)

    @UnsupportedAppUsage

    public String getSimOperatorName(int subId) {

        int phoneId = SubscriptionManager.getPhoneId(subId);

        return getSimOperatorNameForPhone(phoneId);
@@ -2865,7 +2863,7 @@ public class TelephonyManager { 
     * @param subId for which SimCountryIso is returned

     * @hide

     */

    @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.P)

    @UnsupportedAppUsage

    public String getSimCountryIso(int subId) {

        int phoneId = SubscriptionManager.getPhoneId(subId);

        return getSimCountryIsoForPhone(phoneId);
@@ -3055,7 +3053,7 @@ public class TelephonyManager { 
     * @hide

     */

    @RequiresPermission(android.Manifest.permission.READ_PHONE_STATE)

    @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.P)

    @UnsupportedAppUsage

    public String getSubscriberId(int subId) {

        try {

            IPhoneSubInfo info = getSubscriberInfo();
@@ -3440,7 +3438,7 @@ public class TelephonyManager { 
     * @hide

     */

    @RequiresPermission(android.Manifest.permission.READ_PHONE_STATE)

    @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.P)

    @UnsupportedAppUsage

    public String getMsisdn(int subId) {

        try {

            IPhoneSubInfo info = getSubscriberInfo();
@@ -4406,7 +4404,7 @@ public class TelephonyManager { 
   /**

    * @hide

    */

    @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.P)

    @UnsupportedAppUsage

    private ITelephony getITelephony() {

        return ITelephony.Stub.asInterface(ServiceManager.getService(Context.TELEPHONY_SERVICE));

    }
@@ -7787,7 +7785,7 @@ public class TelephonyManager { 
     * either READ_PRIVILEGED_PHONE_STATE or READ_PHONE_STATE to retrieve the information.

     * @hide

     */

    @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.P)

    @UnsupportedAppUsage

    public ServiceState getServiceStateForSubscriber(int subId) {

        try {

            ITelephony service = getITelephony();