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

Commit 75eab471 authored by Amit Mahajan's avatar Amit Mahajan
Browse files

Replace usages of @hide telephony APIs with system/public ones. 

Test: basic sanity, atest SystemUITests
Bug: 146593424
Change-Id: Ie44655551546e74412d3cc699efa687f4458d1c1
parent c847a7ad

packages/SystemUI/Android.bp

+0 −1
Original line number Diff line number Diff line
@@ -136,7 +136,6 @@ android_library { 
    ],

    libs: [

        "android.test.runner",

        "telephony-common",

        "android.test.base",

    ],

    kotlincflags: ["-Xjvm-default=enable"],

packages/SystemUI/src/com/android/keyguard/KeyguardUpdateMonitor.java

+4 −3
Original line number Diff line number Diff line
@@ -371,7 +371,8 @@ public class KeyguardUpdateMonitor implements TrustManager.TrustListener, Dumpab 
        checkIsHandlerThread();

        if (DEBUG_SIM_STATES) {

            Log.v(TAG, "onSubscriptionInfoChanged()");

            List<SubscriptionInfo> sil = mSubscriptionManager.getActiveSubscriptionInfoList(false);

            List<SubscriptionInfo> sil = mSubscriptionManager

                    .getActiveAndHiddenSubscriptionInfoList();

            if (sil != null) {

                for (SubscriptionInfo subInfo : sil) {

                    Log.v(TAG, "SubInfo:" + subInfo);
@@ -425,10 +426,10 @@ public class KeyguardUpdateMonitor implements TrustManager.TrustListener, Dumpab 
    public List<SubscriptionInfo> getSubscriptionInfo(boolean forceReload) {

        List<SubscriptionInfo> sil = mSubscriptionInfo;

        if (sil == null || forceReload) {

            sil = mSubscriptionManager.getActiveSubscriptionInfoList(false);

            sil = mSubscriptionManager.getActiveAndHiddenSubscriptionInfoList();

        }

        if (sil == null) {

            // getActiveSubscriptionInfoList was null callers expect an empty list.

            // getActiveAndHiddenSubscriptionInfoList was null callers expect an empty list.

            mSubscriptionInfo = new ArrayList<SubscriptionInfo>();

        } else {

            mSubscriptionInfo = sil;

packages/SystemUI/src/com/android/systemui/statusbar/policy/MobileSignalController.java

+17 −3
Original line number Diff line number Diff line
@@ -26,10 +26,12 @@ import android.os.Handler; 
import android.os.Looper;

import android.os.Message;

import android.provider.Settings.Global;

import android.telephony.AccessNetworkConstants;

import android.telephony.Annotation;

import android.telephony.CdmaEriInformation;

import android.telephony.CellSignalStrength;

import android.telephony.CellSignalStrengthCdma;

import android.telephony.DataSpecificRegistrationInfo;

import android.telephony.NetworkRegistrationInfo;

import android.telephony.PhoneStateListener;

import android.telephony.ServiceState;
@@ -321,9 +323,9 @@ public class MobileSignalController extends SignalController< 


    private int getNumLevels() {

        if (mInflateSignalStrengths) {

            return SignalStrength.NUM_SIGNAL_STRENGTH_BINS + 1;

            return CellSignalStrength.getNumSignalStrengthLevels() + 1;

        }

        return SignalStrength.NUM_SIGNAL_STRENGTH_BINS;

        return CellSignalStrength.getNumSignalStrengthLevels();

    }



    @Override
@@ -772,12 +774,24 @@ public class MobileSignalController extends SignalController< 
            if (mDataNetType == TelephonyManager.NETWORK_TYPE_LTE) {

                if (isCarrierSpecificDataIcon()) {

                    mCAPlus = true;

                } else if (mServiceState != null && mServiceState.isUsingCarrierAggregation()) {

                } else if (mServiceState != null && isUsingCarrierAggregation(mServiceState)) {

                    mCA = true;

                }

            }

        }



        private boolean isUsingCarrierAggregation(ServiceState serviceState) {

            NetworkRegistrationInfo nri = serviceState.getNetworkRegistrationInfo(

                    NetworkRegistrationInfo.DOMAIN_PS, AccessNetworkConstants.TRANSPORT_TYPE_WWAN);

            if (nri != null) {

                DataSpecificRegistrationInfo dsri = nri.getDataSpecificInfo();

                if (dsri != null) {

                    return dsri.isUsingCarrierAggregation();

                }

            }

            return false;

        }



        @Override

        public void onDataActivity(int direction) {

            if (DEBUG) {

packages/SystemUI/src/com/android/systemui/statusbar/policy/NetworkControllerImpl.java

+3 −4
Original line number Diff line number Diff line
@@ -41,9 +41,9 @@ import android.os.Looper; 
import android.os.PersistableBundle;

import android.provider.Settings;

import android.telephony.CarrierConfigManager;

import android.telephony.CellSignalStrength;

import android.telephony.PhoneStateListener;

import android.telephony.ServiceState;

import android.telephony.SignalStrength;

import android.telephony.SubscriptionInfo;

import android.telephony.SubscriptionManager;

import android.telephony.SubscriptionManager.OnSubscriptionsChangedListener;
@@ -56,7 +56,6 @@ import android.util.SparseArray; 


import com.android.internal.annotations.GuardedBy;

import com.android.internal.annotations.VisibleForTesting;

import com.android.internal.telephony.TelephonyIntents;

import com.android.settingslib.net.DataUsageController;

import com.android.systemui.DemoMode;

import com.android.systemui.Dumpable;
@@ -605,7 +604,7 @@ public class NetworkControllerImpl extends BroadcastReceiver 
    @VisibleForTesting

    void doUpdateMobileControllers() {

        List<SubscriptionInfo> subscriptions = mSubscriptionManager

                .getActiveSubscriptionInfoList(false);

                .getActiveAndHiddenSubscriptionInfoList();

        if (subscriptions == null) {

            subscriptions = Collections.emptyList();

        }
@@ -1035,7 +1034,7 @@ public class NetworkControllerImpl extends BroadcastReceiver 
                if (level != null) {

                    controller.getState().level = level.equals("null") ? -1

                            : Math.min(Integer.parseInt(level),

                                    SignalStrength.NUM_SIGNAL_STRENGTH_BINS);

                                    CellSignalStrength.getNumSignalStrengthLevels());

                    controller.getState().connected = controller.getState().level >= 0;

                }

                if (args.containsKey("inflate")) {

packages/SystemUI/tests/src/com/android/keyguard/CarrierTextControllerTest.java

+1 −1
Original line number Diff line number Diff line
@@ -249,7 +249,7 @@ public class CarrierTextControllerTest extends SysuiTestCase { 


        // STOPSHIP(b/130246708) This line makes sure that SubscriptionManager provides the

        // same answer as KeyguardUpdateMonitor. Remove when this is addressed

        when(mSubscriptionManager.getActiveSubscriptionInfoList(anyBoolean())).thenReturn(

        when(mSubscriptionManager.getActiveAndHiddenSubscriptionInfoList()).thenReturn(

                new ArrayList<>());



        when(mKeyguardUpdateMonitor.getSimState(anyInt())).thenReturn(