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

Commit f23acf33 authored by Alec Mouri's avatar Alec Mouri Committed by Dave Mankoff
Browse files

Revert "Add Controller for Emergency Button." 

Revert submission 13536242-b179775696-depenency-get-keyguard

Reason for revert: Candidate reversion for broken tests: b/180440298
Reverted Changes:
I6d0271692:Add ViewController to CarrierText.
I4d9a4a21f:Add Controller for Emergency Button.
I4c76d99f9:Remove Dependency.get from KeyguardSliceTextView.
I730593fcf:Add injection to ClockProvider.
Ifbb93e624:Remove Dependency.get from KeyguardStatusView.
I237215456:Remove final calls to Dependency.get from keyguard...

Change-Id: I7b46dbad24050cfe6a363131549169602fda1f13
parent 5f65ded5

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

+136 −4
Original line number Diff line number Diff line
@@ -16,16 +16,34 @@ 


package com.android.keyguard;



import static com.android.systemui.DejankUtils.whitelistIpcs;



import android.app.ActivityOptions;

import android.app.ActivityTaskManager;

import android.content.Context;

import android.content.Intent;

import android.content.res.Configuration;

import android.os.PowerManager;

import android.os.RemoteException;

import android.os.SystemClock;

import android.os.UserHandle;

import android.telecom.TelecomManager;

import android.telephony.TelephonyManager;

import android.util.AttributeSet;

import android.util.Log;

import android.util.Slog;

import android.view.MotionEvent;

import android.view.View;

import android.view.ViewConfiguration;

import android.widget.Button;



import com.android.internal.logging.MetricsLogger;

import com.android.internal.logging.nano.MetricsProto.MetricsEvent;

import com.android.internal.util.EmergencyAffordanceManager;

import com.android.internal.widget.LockPatternUtils;

import com.android.settingslib.Utils;

import com.android.systemui.Dependency;

import com.android.systemui.util.EmergencyDialerConstants;



/**

 * This class implements a smart emergency button that updates itself based
@@ -35,14 +53,34 @@ import com.android.settingslib.Utils; 
 */

public class EmergencyButton extends Button {



    private static final String LOG_TAG = "EmergencyButton";

    private final EmergencyAffordanceManager mEmergencyAffordanceManager;



    private int mDownX;

    private int mDownY;

    KeyguardUpdateMonitorCallback mInfoCallback = new KeyguardUpdateMonitorCallback() {



        @Override

        public void onSimStateChanged(int subId, int slotId, int simState) {

            updateEmergencyCallButton();

        }



        @Override

        public void onPhoneStateChanged(int phoneState) {

            updateEmergencyCallButton();

        }

    };

    private boolean mLongPressWasDragged;



    public interface EmergencyButtonCallback {

        public void onEmergencyButtonClickedWhenInCall();

    }



    private LockPatternUtils mLockPatternUtils;

    private PowerManager mPowerManager;

    private EmergencyButtonCallback mEmergencyButtonCallback;



    private final boolean mIsVoiceCapable;

    private final boolean mEnableEmergencyCallWhileSimLocked;



    public EmergencyButton(Context context) {
@@ -51,15 +89,34 @@ public class EmergencyButton extends Button { 


    public EmergencyButton(Context context, AttributeSet attrs) {

        super(context, attrs);

        mIsVoiceCapable = getTelephonyManager().isVoiceCapable();

        mEnableEmergencyCallWhileSimLocked = mContext.getResources().getBoolean(

                com.android.internal.R.bool.config_enable_emergency_call_while_sim_locked);

        mEmergencyAffordanceManager = new EmergencyAffordanceManager(context);

    }



    private TelephonyManager getTelephonyManager() {

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

    }



    @Override

    protected void onAttachedToWindow() {

        super.onAttachedToWindow();

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

    }



    @Override

    protected void onDetachedFromWindow() {

        super.onDetachedFromWindow();

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

    }



    @Override

    protected void onFinishInflate() {

        super.onFinishInflate();

        mLockPatternUtils = new LockPatternUtils(mContext);

        mPowerManager = (PowerManager) mContext.getSystemService(Context.POWER_SERVICE);

        setOnClickListener(v -> takeEmergencyCallAction());

        if (mEmergencyAffordanceManager.needsEmergencyAffordance()) {

            setOnLongClickListener(v -> {

                if (!mLongPressWasDragged
@@ -70,6 +127,7 @@ public class EmergencyButton extends Button { 
                return false;

            });

        }

        whitelistIpcs(this::updateEmergencyCallButton);

    }



    @Override
@@ -107,13 +165,65 @@ public class EmergencyButton extends Button { 
        return super.performLongClick();

    }



    void updateEmergencyCallButton(boolean isInCall, boolean isVoiceCapable, boolean simLocked) {

    @Override

    protected void onConfigurationChanged(Configuration newConfig) {

        super.onConfigurationChanged(newConfig);

        updateEmergencyCallButton();

    }



    /**

     * Shows the emergency dialer or returns the user to the existing call.

     */

    public void takeEmergencyCallAction() {

        MetricsLogger.action(mContext, MetricsEvent.ACTION_EMERGENCY_CALL);

        if (mPowerManager != null) {

            mPowerManager.userActivity(SystemClock.uptimeMillis(), true);

        }

        try {

            ActivityTaskManager.getService().stopSystemLockTaskMode();

        } catch (RemoteException e) {

            Slog.w(LOG_TAG, "Failed to stop app pinning");

        }

        if (isInCall()) {

            resumeCall();

            if (mEmergencyButtonCallback != null) {

                mEmergencyButtonCallback.onEmergencyButtonClickedWhenInCall();

            }

        } else {

            KeyguardUpdateMonitor updateMonitor = Dependency.get(KeyguardUpdateMonitor.class);

            if (updateMonitor != null) {

                updateMonitor.reportEmergencyCallAction(true /* bypassHandler */);

            } else {

                Log.w(LOG_TAG, "KeyguardUpdateMonitor was null, launching intent anyway.");

            }

            TelecomManager telecomManager = getTelecommManager();

            if (telecomManager == null) {

                Log.wtf(LOG_TAG, "TelecomManager was null, cannot launch emergency dialer");

                return;

            }

            Intent emergencyDialIntent =

                    telecomManager.createLaunchEmergencyDialerIntent(null /* number*/)

                            .setFlags(Intent.FLAG_ACTIVITY_NEW_TASK

                                    | Intent.FLAG_ACTIVITY_EXCLUDE_FROM_RECENTS

                                    | Intent.FLAG_ACTIVITY_CLEAR_TOP)

                            .putExtra(EmergencyDialerConstants.EXTRA_ENTRY_TYPE,

                                    EmergencyDialerConstants.ENTRY_TYPE_LOCKSCREEN_BUTTON);



            getContext().startActivityAsUser(emergencyDialIntent,

                    ActivityOptions.makeCustomAnimation(getContext(), 0, 0).toBundle(),

                    new UserHandle(KeyguardUpdateMonitor.getCurrentUser()));

        }

    }



    private void updateEmergencyCallButton() {

        boolean visible = false;

        if (isVoiceCapable) {

        if (mIsVoiceCapable) {

            // Emergency calling requires voice capability.

            if (isInCall) {

            if (isInCall()) {

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

            } else {

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

                        .isSimPinVoiceSecure();

                if (simLocked) {

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

                    visible = mEnableEmergencyCallWhileSimLocked;
@@ -127,7 +237,7 @@ public class EmergencyButton extends Button { 
            setVisibility(View.VISIBLE);



            int textId;

            if (isInCall) {

            if (isInCall()) {

                textId = com.android.internal.R.string.lockscreen_return_to_call;

            } else {

                textId = com.android.internal.R.string.lockscreen_emergency_call;
@@ -137,4 +247,26 @@ public class EmergencyButton extends Button { 
            setVisibility(View.GONE);

        }

    }



    public void setCallback(EmergencyButtonCallback callback) {

        mEmergencyButtonCallback = callback;

    }



    /**

     * Resumes a call in progress.

     */

    private void resumeCall() {

        getTelecommManager().showInCallScreen(false);

    }



    /**

     * @return {@code true} if there is a call currently in progress.

     */

    private boolean isInCall() {

        return getTelecommManager().isInCall();

    }



    private TelecomManager getTelecommManager() {

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

    }

}

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

deleted100644 → 0
+0 −196
Original line number Diff line number Diff line 
/*

 * Copyright (C) 2021 The Android Open Source Project

 *

 * Licensed under the Apache License, Version 2.0 (the "License");

 * you may not use this file except in compliance with the License.

 * You may obtain a copy of the License at

 *

 *      http://www.apache.org/licenses/LICENSE-2.0

 *

 * Unless required by applicable law or agreed to in writing, software

 * distributed under the License is distributed on an "AS IS" BASIS,

 * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

 * See the License for the specific language governing permissions and

 * limitations under the License.

 */



package com.android.keyguard;



import static com.android.systemui.DejankUtils.whitelistIpcs;



import android.app.ActivityOptions;

import android.app.ActivityTaskManager;

import android.content.Intent;

import android.content.res.Configuration;

import android.os.PowerManager;

import android.os.SystemClock;

import android.os.UserHandle;

import android.telecom.TelecomManager;

import android.telephony.TelephonyManager;

import android.util.Log;



import androidx.annotation.Nullable;



import com.android.internal.logging.MetricsLogger;

import com.android.internal.logging.nano.MetricsProto.MetricsEvent;

import com.android.keyguard.dagger.KeyguardBouncerScope;

import com.android.systemui.statusbar.policy.ConfigurationController;

import com.android.systemui.statusbar.policy.ConfigurationController.ConfigurationListener;

import com.android.systemui.util.EmergencyDialerConstants;

import com.android.systemui.util.ViewController;



import javax.inject.Inject;



/** View Controller for {@link com.android.keyguard.EmergencyButton}. */

@KeyguardBouncerScope

public class EmergencyButtonController extends ViewController<EmergencyButton> {

    static final String LOG_TAG = "EmergencyButton";

    private final ConfigurationController mConfigurationController;

    private final KeyguardUpdateMonitor mKeyguardUpdateMonitor;

    private final TelephonyManager mTelephonyManager;

    private final PowerManager mPowerManager;

    private final ActivityTaskManager mActivityTaskManager;

    private final TelecomManager mTelecomManager;

    private final MetricsLogger mMetricsLogger;



    private EmergencyButtonCallback mEmergencyButtonCallback;



    private final KeyguardUpdateMonitorCallback mInfoCallback =

            new KeyguardUpdateMonitorCallback() {

        @Override

        public void onSimStateChanged(int subId, int slotId, int simState) {

            updateEmergencyCallButton();

        }



        @Override

        public void onPhoneStateChanged(int phoneState) {

            updateEmergencyCallButton();

        }

    };



    private final ConfigurationListener mConfigurationListener = new ConfigurationListener() {

        @Override

        public void onConfigChanged(Configuration newConfig) {

            updateEmergencyCallButton();

        }

    };



    private EmergencyButtonController(@Nullable EmergencyButton view,

            ConfigurationController configurationController,

            KeyguardUpdateMonitor keyguardUpdateMonitor, TelephonyManager telephonyManager,

            PowerManager powerManager, ActivityTaskManager activityTaskManager,

            @Nullable TelecomManager telecomManager, MetricsLogger metricsLogger) {

        super(view);

        mConfigurationController = configurationController;

        mKeyguardUpdateMonitor = keyguardUpdateMonitor;

        mTelephonyManager = telephonyManager;

        mPowerManager = powerManager;

        mActivityTaskManager = activityTaskManager;

        mTelecomManager = telecomManager;

        mMetricsLogger = metricsLogger;

    }



    @Override

    protected void onInit() {

        whitelistIpcs(this::updateEmergencyCallButton);

    }



    @Override

    protected void onViewAttached() {

        mKeyguardUpdateMonitor.registerCallback(mInfoCallback);

        mConfigurationController.addCallback(mConfigurationListener);

        mView.setOnClickListener(v -> takeEmergencyCallAction());

    }



    @Override

    protected void onViewDetached() {

        mKeyguardUpdateMonitor.removeCallback(mInfoCallback);

        mConfigurationController.removeCallback(mConfigurationListener);

    }



    private void updateEmergencyCallButton() {

        if (mView != null) {

            mView.updateEmergencyCallButton(

                    mTelecomManager != null && mTelecomManager.isInCall(),

                    mTelephonyManager.isVoiceCapable(),

                    mKeyguardUpdateMonitor.isSimPinVoiceSecure());

        }

    }



    public void setEmergencyButtonCallback(EmergencyButtonCallback callback) {

        mEmergencyButtonCallback = callback;

    }

    /**

     * Shows the emergency dialer or returns the user to the existing call.

     */

    public void takeEmergencyCallAction() {

        mMetricsLogger.action(MetricsEvent.ACTION_EMERGENCY_CALL);

        if (mPowerManager != null) {

            mPowerManager.userActivity(SystemClock.uptimeMillis(), true);

        }

        mActivityTaskManager.stopSystemLockTaskMode();

        if (mTelecomManager != null && mTelecomManager.isInCall()) {

            mTelecomManager.showInCallScreen(false);

            if (mEmergencyButtonCallback != null) {

                mEmergencyButtonCallback.onEmergencyButtonClickedWhenInCall();

            }

        } else {

            mKeyguardUpdateMonitor.reportEmergencyCallAction(true /* bypassHandler */);

            if (mTelecomManager == null) {

                Log.wtf(LOG_TAG, "TelecomManager was null, cannot launch emergency dialer");

                return;

            }

            Intent emergencyDialIntent =

                    mTelecomManager.createLaunchEmergencyDialerIntent(null /* number*/)

                            .setFlags(Intent.FLAG_ACTIVITY_NEW_TASK

                                    | Intent.FLAG_ACTIVITY_EXCLUDE_FROM_RECENTS

                                    | Intent.FLAG_ACTIVITY_CLEAR_TOP)

                            .putExtra(EmergencyDialerConstants.EXTRA_ENTRY_TYPE,

                                    EmergencyDialerConstants.ENTRY_TYPE_LOCKSCREEN_BUTTON);



            getContext().startActivityAsUser(emergencyDialIntent,

                    ActivityOptions.makeCustomAnimation(getContext(), 0, 0).toBundle(),

                    new UserHandle(KeyguardUpdateMonitor.getCurrentUser()));

        }

    }



    /** */

    public interface EmergencyButtonCallback {

        /** */

        void onEmergencyButtonClickedWhenInCall();

    }



    /** Injectable Factory for creating {@link EmergencyButtonController}. */

    public static class Factory {

        private final ConfigurationController mConfigurationController;

        private final KeyguardUpdateMonitor mKeyguardUpdateMonitor;

        private final TelephonyManager mTelephonyManager;

        private final PowerManager mPowerManager;

        private final ActivityTaskManager mActivityTaskManager;

        @Nullable

        private final TelecomManager mTelecomManager;

        private final MetricsLogger mMetricsLogger;



        @Inject

        public Factory(ConfigurationController configurationController,

                KeyguardUpdateMonitor keyguardUpdateMonitor, TelephonyManager telephonyManager,

                PowerManager powerManager, ActivityTaskManager activityTaskManager,

                @Nullable TelecomManager telecomManager, MetricsLogger metricsLogger) {



            mConfigurationController = configurationController;

            mKeyguardUpdateMonitor = keyguardUpdateMonitor;

            mTelephonyManager = telephonyManager;

            mPowerManager = powerManager;

            mActivityTaskManager = activityTaskManager;

            mTelecomManager = telecomManager;

            mMetricsLogger = metricsLogger;

        }



        /** Construct an {@link com.android.keyguard.EmergencyButtonController}. */

        public EmergencyButtonController create(EmergencyButton view) {

            return new EmergencyButtonController(view, mConfigurationController,

                    mKeyguardUpdateMonitor, mTelephonyManager, mPowerManager, mActivityTaskManager,

                    mTelecomManager, mMetricsLogger);

        }

    }

}

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

+7 −7
Original line number Diff line number Diff line
@@ -31,7 +31,7 @@ import com.android.internal.util.LatencyTracker; 
import com.android.internal.widget.LockPatternChecker;

import com.android.internal.widget.LockPatternUtils;

import com.android.internal.widget.LockscreenCredential;

import com.android.keyguard.EmergencyButtonController.EmergencyButtonCallback;

import com.android.keyguard.EmergencyButton.EmergencyButtonCallback;

import com.android.keyguard.KeyguardAbsKeyInputView.KeyDownListener;

import com.android.keyguard.KeyguardSecurityModel.SecurityMode;

import com.android.systemui.R;
@@ -41,7 +41,6 @@ public abstract class KeyguardAbsKeyInputViewController<T extends KeyguardAbsKey 
    private final KeyguardUpdateMonitor mKeyguardUpdateMonitor;

    private final LockPatternUtils mLockPatternUtils;

    private final LatencyTracker mLatencyTracker;

    private final EmergencyButtonController mEmergencyButtonController;

    private CountDownTimer mCountdownTimer;

    protected KeyguardMessageAreaController mMessageAreaController;

    private boolean mDismissing;
@@ -71,12 +70,11 @@ public abstract class KeyguardAbsKeyInputViewController<T extends KeyguardAbsKey 
            LockPatternUtils lockPatternUtils,

            KeyguardSecurityCallback keyguardSecurityCallback,

            KeyguardMessageAreaController.Factory messageAreaControllerFactory,

            LatencyTracker latencyTracker, EmergencyButtonController emergencyButtonController) {

        super(view, securityMode, keyguardSecurityCallback, emergencyButtonController);

            LatencyTracker latencyTracker) {

        super(view, securityMode, keyguardSecurityCallback);

        mKeyguardUpdateMonitor = keyguardUpdateMonitor;

        mLockPatternUtils = lockPatternUtils;

        mLatencyTracker = latencyTracker;

        mEmergencyButtonController = emergencyButtonController;

        KeyguardMessageArea kma = KeyguardMessageArea.findSecurityMessageDisplay(mView);

        mMessageAreaController = messageAreaControllerFactory.create(kma);

    }
@@ -85,7 +83,6 @@ public abstract class KeyguardAbsKeyInputViewController<T extends KeyguardAbsKey 


    @Override

    public void onInit() {

        super.onInit();

        mMessageAreaController.init();

    }
@@ -94,7 +91,10 @@ public abstract class KeyguardAbsKeyInputViewController<T extends KeyguardAbsKey 
        super.onViewAttached();

        mView.setKeyDownListener(mKeyDownListener);

        mView.setEnableHaptics(mLockPatternUtils.isTactileFeedbackEnabled());

        mEmergencyButtonController.setEmergencyButtonCallback(mEmergencyButtonCallback);

        EmergencyButton button = mView.findViewById(R.id.emergency_call_button);

        if (button != null) {

            button.setCallback(mEmergencyButtonCallback);

        }

    }



    @Override

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

+6 −26
Original line number Diff line number Diff line
@@ -42,7 +42,6 @@ public abstract class KeyguardInputViewController<T extends KeyguardInputView> 
    private final SecurityMode mSecurityMode;

    private final KeyguardSecurityCallback mKeyguardSecurityCallback;

    private final EmergencyButton mEmergencyButton;

    private final EmergencyButtonController mEmergencyButtonController;

    private boolean mPaused;
@@ -70,18 +69,11 @@ public abstract class KeyguardInputViewController<T extends KeyguardInputView> 
    };



    protected KeyguardInputViewController(T view, SecurityMode securityMode,

            KeyguardSecurityCallback keyguardSecurityCallback,

            EmergencyButtonController emergencyButtonController) {

            KeyguardSecurityCallback keyguardSecurityCallback) {

        super(view);

        mSecurityMode = securityMode;

        mKeyguardSecurityCallback = keyguardSecurityCallback;

        mEmergencyButton = view == null ? null : view.findViewById(R.id.emergency_call_button);

        mEmergencyButtonController = emergencyButtonController;

    }



    @Override

    protected void onInit() {

        mEmergencyButtonController.init();

    }



    @Override
@@ -163,9 +155,8 @@ public abstract class KeyguardInputViewController<T extends KeyguardInputView> 
        private final InputMethodManager mInputMethodManager;

        private final DelayableExecutor mMainExecutor;

        private final Resources mResources;

        private final LiftToActivateListener mLiftToActivateListener;

        private final TelephonyManager mTelephonyManager;

        private final EmergencyButtonController.Factory mEmergencyButtonControllerFactory;

        private LiftToActivateListener mLiftToActivateListener;

        private TelephonyManager mTelephonyManager;

        private final FalsingCollector mFalsingCollector;

        private final boolean mIsNewLayoutEnabled;
@@ -177,7 +168,6 @@ public abstract class KeyguardInputViewController<T extends KeyguardInputView> 
                InputMethodManager inputMethodManager, @Main DelayableExecutor mainExecutor,

                @Main Resources resources, LiftToActivateListener liftToActivateListener,

                TelephonyManager telephonyManager,

                EmergencyButtonController.Factory emergencyButtonControllerFactory,

                FalsingCollector falsingCollector,

                FeatureFlags featureFlags) {

            mKeyguardUpdateMonitor = keyguardUpdateMonitor;
@@ -189,7 +179,6 @@ public abstract class KeyguardInputViewController<T extends KeyguardInputView> 
            mResources = resources;

            mLiftToActivateListener = liftToActivateListener;

            mTelephonyManager = telephonyManager;

            mEmergencyButtonControllerFactory = emergencyButtonControllerFactory;

            mFalsingCollector = falsingCollector;

            mIsNewLayoutEnabled = featureFlags.isKeyguardLayoutEnabled();

        }
@@ -197,40 +186,31 @@ public abstract class KeyguardInputViewController<T extends KeyguardInputView> 
        /** Create a new {@link KeyguardInputViewController}. */

        public KeyguardInputViewController create(KeyguardInputView keyguardInputView,

                SecurityMode securityMode, KeyguardSecurityCallback keyguardSecurityCallback) {

            EmergencyButtonController emergencyButtonController =

                    mEmergencyButtonControllerFactory.create(

                            keyguardInputView.findViewById(R.id.emergency_call_button));



            if (keyguardInputView instanceof KeyguardPatternView) {

                return new KeyguardPatternViewController((KeyguardPatternView) keyguardInputView,

                        mKeyguardUpdateMonitor, securityMode, mLockPatternUtils,

                        keyguardSecurityCallback, mLatencyTracker,

                        emergencyButtonController,

                        mMessageAreaControllerFactory);

                        keyguardSecurityCallback, mLatencyTracker, mMessageAreaControllerFactory);

            } else if (keyguardInputView instanceof KeyguardPasswordView) {

                return new KeyguardPasswordViewController((KeyguardPasswordView) keyguardInputView,

                        mKeyguardUpdateMonitor, securityMode, mLockPatternUtils,

                        keyguardSecurityCallback, mMessageAreaControllerFactory, mLatencyTracker,

                        mInputMethodManager, emergencyButtonController, mMainExecutor, mResources);

                        mInputMethodManager, mMainExecutor, mResources);

            } else if (keyguardInputView instanceof KeyguardPINView) {

                return new KeyguardPinViewController((KeyguardPINView) keyguardInputView,

                        mKeyguardUpdateMonitor, securityMode, mLockPatternUtils,

                        keyguardSecurityCallback, mMessageAreaControllerFactory, mLatencyTracker,

                        mLiftToActivateListener, emergencyButtonController, mFalsingCollector,

                        mIsNewLayoutEnabled);

                        mLiftToActivateListener, mFalsingCollector, mIsNewLayoutEnabled);

            } else if (keyguardInputView instanceof KeyguardSimPinView) {

                return new KeyguardSimPinViewController((KeyguardSimPinView) keyguardInputView,

                        mKeyguardUpdateMonitor, securityMode, mLockPatternUtils,

                        keyguardSecurityCallback, mMessageAreaControllerFactory, mLatencyTracker,

                        mLiftToActivateListener, mTelephonyManager,

                        emergencyButtonController,

                        mFalsingCollector, mIsNewLayoutEnabled);

            } else if (keyguardInputView instanceof KeyguardSimPukView) {

                return new KeyguardSimPukViewController((KeyguardSimPukView) keyguardInputView,

                        mKeyguardUpdateMonitor, securityMode, mLockPatternUtils,

                        keyguardSecurityCallback, mMessageAreaControllerFactory, mLatencyTracker,

                        mLiftToActivateListener, mTelephonyManager,

                        emergencyButtonController,

                        mFalsingCollector, mIsNewLayoutEnabled);

            }

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

+1 −2
Original line number Diff line number Diff line
@@ -111,11 +111,10 @@ public class KeyguardPasswordViewController 
            KeyguardMessageAreaController.Factory messageAreaControllerFactory,

            LatencyTracker latencyTracker,

            InputMethodManager inputMethodManager,

            EmergencyButtonController emergencyButtonController,

            @Main DelayableExecutor mainExecutor,

            @Main Resources resources) {

        super(view, keyguardUpdateMonitor, securityMode, lockPatternUtils, keyguardSecurityCallback,

                messageAreaControllerFactory, latencyTracker, emergencyButtonController);

                messageAreaControllerFactory, latencyTracker);

        mKeyguardSecurityCallback = keyguardSecurityCallback;

        mInputMethodManager = inputMethodManager;

        mMainExecutor = mainExecutor;