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

Commit d4e2c6cd authored by Chen Xu's avatar Chen Xu Committed by Gerrit Code Review
Browse files

Merge "Revert "Revert "Telephony light grey list clean up for Q"""

parents f469bd2f 4c0b06d1

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

    @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.P)

    public static TelecomManager from(Context context) {

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

    }

telephony/java/android/telephony/ServiceState.java

+7 −7
Original line number Diff line number Diff line
@@ -247,7 +247,7 @@ public class ServiceState implements Parcelable { 
    private String mDataOperatorAlphaLong;

    private String mDataOperatorAlphaShort;

    private String mDataOperatorNumeric;

    @UnsupportedAppUsage

    @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.P)

    private boolean mIsManualNetworkSelection;



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


    @UnsupportedAppUsage

    private boolean mCssIndicator;

    @UnsupportedAppUsage

    @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.P)

    private int mNetworkId;

    @UnsupportedAppUsage

    @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.P)

    private int mSystemId;

    @UnsupportedAppUsage

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

     * @hide

     */

    @UnsupportedAppUsage

    @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.P)

    public int getVoiceRegState() {

        return mVoiceRegState;

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

     * @hide

     */

    @UnsupportedAppUsage

    @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.P)

    public int getDataRegState() {

        return mDataRegState;

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

     * @hide

     */

    @UnsupportedAppUsage

    @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.P)

    public boolean getVoiceRoaming() {

        return getVoiceRoamingType() != ROAMING_TYPE_NOT_ROAMING;

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

     * @hide

     */

    @UnsupportedAppUsage

    @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.P)

    public boolean getDataRoaming() {

        return getDataRoamingType() != ROAMING_TYPE_NOT_ROAMING;

    }

telephony/java/android/telephony/SubscriptionManager.java

+3 −3
Original line number Diff line number Diff line
@@ -1369,7 +1369,7 @@ public class SubscriptionManager { 
    }



    /** @hide */

    @UnsupportedAppUsage

    @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.P)

    public static int getPhoneId(int subId) {

        if (!isValidSubscriptionId(subId)) {

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

     * @hide

     */

    @UnsupportedAppUsage

    @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.P)

    public static boolean isUsableSubIdValue(int subId) {

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

    }
@@ -1683,7 +1683,7 @@ public class SubscriptionManager { 
    }



    /** @hide */

    @UnsupportedAppUsage

    @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.P)

    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

+17 −16
Original line number Diff line number Diff line
@@ -232,7 +232,8 @@ public class TelephonyManager { 


    /** @hide

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

    @UnsupportedAppUsage

    @Deprecated

    @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.P)

    public static TelephonyManager getDefault() {

        return sInstance;

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



    /** {@hide} */

    @UnsupportedAppUsage

    @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.P)

    public static TelephonyManager from(Context context) {

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

    }
@@ -1890,7 +1891,7 @@ public class TelephonyManager { 
     * @param subId

     * @hide

     */

    @UnsupportedAppUsage

    @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.P)

    public String getNetworkOperatorName(int subId) {

        int phoneId = SubscriptionManager.getPhoneId(subId);

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

     * @hide

     */

    @UnsupportedAppUsage

    @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.P)

    public String getNetworkOperator(int subId) {

        int phoneId = SubscriptionManager.getPhoneId(subId);

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

     */

    @RequiresPermission(android.Manifest.permission.READ_PHONE_STATE)

    @UnsupportedAppUsage

    @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.P)

    public int getDataNetworkType(int subId) {

        try{

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

     */

    @RequiresPermission(android.Manifest.permission.READ_PHONE_STATE)

    @UnsupportedAppUsage

    @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.P)

    public int getVoiceNetworkType(int subId) {

        try{

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

     * @hide

     */

    @UnsupportedAppUsage

    @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.P)

    public String getSimOperator(int subId) {

        return getSimOperatorNumeric(subId);

    }
@@ -2775,7 +2776,7 @@ public class TelephonyManager { 
     * @see #getSimState

     * @hide

     */

    @UnsupportedAppUsage

    @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.P)

    public String getSimOperatorNumeric() {

        int subId = mSubId;

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

     * @hide

     */

    @UnsupportedAppUsage

    @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.P)

    public String getSimOperatorNumeric(int subId) {

        int phoneId = SubscriptionManager.getPhoneId(subId);

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

     * @hide

     */

    @UnsupportedAppUsage

    @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.P)

    public String getSimOperatorNumericForPhone(int phoneId) {

        return getTelephonyProperty(phoneId,

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

     * @hide

     */

    @UnsupportedAppUsage

    @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.P)

    public String getSimOperatorName(int subId) {

        int phoneId = SubscriptionManager.getPhoneId(subId);

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

     * @hide

     */

    @UnsupportedAppUsage

    @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.P)

    public String getSimCountryIso(int subId) {

        int phoneId = SubscriptionManager.getPhoneId(subId);

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

     */

    @RequiresPermission(android.Manifest.permission.READ_PHONE_STATE)

    @UnsupportedAppUsage

    @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.P)

    public String getSubscriberId(int subId) {

        try {

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

     */

    @RequiresPermission(android.Manifest.permission.READ_PHONE_STATE)

    @UnsupportedAppUsage

    @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.P)

    public String getMsisdn(int subId) {

        try {

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

    * @hide

    */

    @UnsupportedAppUsage

    @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.P)

    private ITelephony getITelephony() {

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

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

     * @hide

     */

    @UnsupportedAppUsage

    @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.P)

    public ServiceState getServiceStateForSubscriber(int subId) {

        try {

            ITelephony service = getITelephony();