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

Commit a43d0a71 authored by Jayachandran C's avatar Jayachandran C
Browse files

Remove usage of hidden API in System UI 

TelephonyManager.getSimCount()
TelephonyManager.getDefault()
TelephonyManager.from()

Bug: 111498835
Test: Manual DSDS test cases
      atest com.android.systemui.statusbar.policy

Change-Id: I676a70a5dbd2dcbdbbee6cd889ffd614dc42fb9d
parent 7a11056a

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

+6 −1
Original line number Diff line number Diff line
@@ -104,7 +104,12 @@ public class KeyguardSimPinView extends KeyguardPinBasedInputView { 


    private void setLockedSimMessage() {

        boolean isEsimLocked = KeyguardEsimArea.isEsimLocked(mContext, mSubId);

        int count = TelephonyManager.getDefault().getSimCount();

        int count = 1;

        TelephonyManager telephonyManager =

            (TelephonyManager) mContext.getSystemService(Context.TELEPHONY_SERVICE);

        if (telephonyManager != null) {

            count = telephonyManager.getActiveModemCount();

        }

        Resources rez = getResources();

        String msg;

        TypedArray array = mContext.obtainStyledAttributes(new int[] { R.attr.wallpaperTextColor });

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

+6 −1
Original line number Diff line number Diff line
@@ -164,7 +164,12 @@ public class KeyguardSimPukView extends KeyguardPinBasedInputView { 
        }



        boolean isEsimLocked = KeyguardEsimArea.isEsimLocked(mContext, mSubId);

        int count = TelephonyManager.getDefault().getSimCount();

        int count = 1;

        TelephonyManager telephonyManager =

            (TelephonyManager) mContext.getSystemService(Context.TELEPHONY_SERVICE);

        if (telephonyManager != null) {

            count = telephonyManager.getActiveModemCount();

        }

        Resources rez = getResources();

        String msg;

        TypedArray array = mContext.obtainStyledAttributes(new int[] { R.attr.wallpaperTextColor });

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

+4 −2
Original line number Diff line number Diff line
@@ -2647,8 +2647,10 @@ public class KeyguardUpdateMonitor implements TrustManager.TrustListener, Dumpab 
        // that don't return the complete set of values and have different types. In Keyguard we

        // need IccCardConstants, but TelephonyManager would only give us

        // TelephonyManager.SIM_STATE*, so we retrieve it manually.

        final TelephonyManager tele = TelephonyManager.from(mContext);

        int simState = tele.getSimState(slotId);

        final TelephonyManager tele =

            (TelephonyManager) mContext.getSystemService(Context.TELEPHONY_SERVICE);

        int simState = (tele != null) ?

            tele.getSimState(slotId) : TelephonyManager.SIM_STATE_UNKNOWN;

        State state;

        try {

            state = State.intToState(simState);

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

+1 −1
Original line number Diff line number Diff line
@@ -643,7 +643,7 @@ public class NetworkControllerImpl extends BroadcastReceiver 
    }



    private boolean hasAnySim() {

        int simCount = mPhone.getSimCount();

        int simCount = mPhone.getActiveModemCount();

        for (int i = 0; i < simCount; i++) {

            int state = mPhone.getSimState(i);

            if (state != TelephonyManager.SIM_STATE_ABSENT

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

+5 −2
Original line number Diff line number Diff line
@@ -459,8 +459,11 @@ public class UserSwitcherController implements Dumpable { 
    }



    private void listenForCallState() {

        TelephonyManager.from(mContext).listen(mPhoneStateListener,

                PhoneStateListener.LISTEN_CALL_STATE);

        final TelephonyManager tele =

            (TelephonyManager) mContext.getSystemService(Context.TELEPHONY_SERVICE);

        if (tele != null) {

            tele.listen(mPhoneStateListener, PhoneStateListener.LISTEN_CALL_STATE);

        }

    }



    private final PhoneStateListener mPhoneStateListener = new PhoneStateListener() {