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

Commit e229469a authored by Dave Mankoff's avatar Dave Mankoff
Browse files

Fix the looper that KeyguardUpdateMonitor is using. 

Bug: 139051615
Test: atest SystemUITests && atest SystemUIGoogleTests
Change-Id: Ic4dd5978001c208504c137cee41f363d7e70b1b5
parent 9cdab3bf

packages/CarSystemUI/src/com/android/systemui/statusbar/car/CarStatusBar.java

+2 −2
Original line number Diff line number Diff line
@@ -948,8 +948,8 @@ public class CarStatusBar extends StatusBar implements CarBatteryController.Batt 
        pw.print("  mNavigationBarView=");

        pw.println(mNavigationBarView);



        if (KeyguardUpdateMonitor.getInstance(mContext) != null) {

            KeyguardUpdateMonitor.getInstance(mContext).dump(fd, pw, args);

        if (Dependency.get(KeyguardUpdateMonitor.class) != null) {

            Dependency.get(KeyguardUpdateMonitor.class).dump(fd, pw, args);

        }



        Dependency.get(FalsingManager.class).dump(pw);

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

+3 −1
Original line number Diff line number Diff line
@@ -24,6 +24,8 @@ import android.util.AttributeSet; 
import android.view.View;

import android.widget.TextView;



import com.android.systemui.Dependency;



import java.util.Locale;



public class CarrierText extends TextView {
@@ -83,7 +85,7 @@ public class CarrierText extends TextView { 
                com.android.internal.R.string.kg_text_message_separator);

        mCarrierTextController = new CarrierTextController(mContext, mSeparator, mShowAirplaneMode,

                mShowMissingSim);

        mShouldMarquee = KeyguardUpdateMonitor.getInstance(mContext).isDeviceInteractive();

        mShouldMarquee = Dependency.get(KeyguardUpdateMonitor.class).isDeviceInteractive();

        setSelected(mShouldMarquee); // Allow marquee to work.

    }

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

+2 −2
Original line number Diff line number Diff line
@@ -225,7 +225,7 @@ public class CarrierTextController { 
            // TODO(b/140034799)

            if (whitelistIpcs(() -> ConnectivityManager.from(mContext).isNetworkSupported(

                    ConnectivityManager.TYPE_MOBILE))) {

                mKeyguardUpdateMonitor = KeyguardUpdateMonitor.getInstance(mContext);

                mKeyguardUpdateMonitor = Dependency.get(KeyguardUpdateMonitor.class);

                mKeyguardUpdateMonitor.registerCallback(mCallback);

                mWakefulnessLifecycle.addObserver(mWakefulnessObserver);

                telephonyManager.listen(mPhoneStateListener,
@@ -487,7 +487,7 @@ public class CarrierTextController { 
        }



        final boolean missingAndNotProvisioned =

                !KeyguardUpdateMonitor.getInstance(mContext).isDeviceProvisioned()

                !Dependency.get(KeyguardUpdateMonitor.class).isDeviceProvisioned()

                        && (simState == IccCardConstants.State.ABSENT

                        || simState == IccCardConstants.State.PERM_DISABLED);

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

+5 −4
Original line number Diff line number Diff line
@@ -40,6 +40,7 @@ import com.android.internal.logging.nano.MetricsProto.MetricsEvent; 
import com.android.internal.telephony.IccCardConstants.State;

import com.android.internal.util.EmergencyAffordanceManager;

import com.android.internal.widget.LockPatternUtils;

import com.android.systemui.Dependency;

import com.android.systemui.util.EmergencyDialerConstants;



/**
@@ -104,13 +105,13 @@ public class EmergencyButton extends Button { 
    @Override

    protected void onAttachedToWindow() {

        super.onAttachedToWindow();

        KeyguardUpdateMonitor.getInstance(mContext).registerCallback(mInfoCallback);

        Dependency.get(KeyguardUpdateMonitor.class).registerCallback(mInfoCallback);

    }



    @Override

    protected void onDetachedFromWindow() {

        super.onDetachedFromWindow();

        KeyguardUpdateMonitor.getInstance(mContext).removeCallback(mInfoCallback);

        Dependency.get(KeyguardUpdateMonitor.class).removeCallback(mInfoCallback);

    }



    @Override
@@ -186,7 +187,7 @@ public class EmergencyButton extends Button { 
                mEmergencyButtonCallback.onEmergencyButtonClickedWhenInCall();

            }

        } else {

            KeyguardUpdateMonitor.getInstance(mContext).reportEmergencyCallAction(

            Dependency.get(KeyguardUpdateMonitor.class).reportEmergencyCallAction(

                    true /* bypassHandler */);

            getContext().startActivityAsUser(INTENT_EMERGENCY_DIAL,

                    ActivityOptions.makeCustomAnimation(getContext(), 0, 0).toBundle(),
@@ -201,7 +202,7 @@ public class EmergencyButton extends Button { 
            if (isInCall()) {

                visible = true; // always show "return to call" if phone is off-hook

            } else {

                final boolean simLocked = KeyguardUpdateMonitor.getInstance(mContext)

                final boolean simLocked = Dependency.get(KeyguardUpdateMonitor.class)

                        .isSimPinVoiceSecure();

                if (simLocked) {

                    // Some countries can't handle emergency calls while SIM is locked.

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

+2 −1
Original line number Diff line number Diff line
@@ -35,6 +35,7 @@ import com.android.internal.widget.LockPatternUtils; 
import com.android.keyguard.KeyguardSecurityContainer.SecurityCallback;

import com.android.keyguard.KeyguardSecurityModel.SecurityMode;

import com.android.settingslib.Utils;

import com.android.systemui.Dependency;

import com.android.systemui.plugins.ActivityStarter.OnDismissAction;



import java.io.File;
@@ -106,7 +107,7 @@ public class KeyguardHostView extends FrameLayout implements SecurityCallback { 


    public KeyguardHostView(Context context, AttributeSet attrs) {

        super(context, attrs);

        KeyguardUpdateMonitor.getInstance(context).registerCallback(mUpdateCallback);

        Dependency.get(KeyguardUpdateMonitor.class).registerCallback(mUpdateCallback);

    }



    @Override