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

Commit c7666d77 authored by Caitlin Shkuratov's avatar Caitlin Shkuratov
Browse files

[CS] Remove CentralSurfaces#isKeyguardSecure. 

Bug: 277764509
Test: verified via logging value is correct
Test: atest CentralSurfacesImplTest
Change-Id: I48eeb8b0b4bdb8ff7e588ad01952efab12f58149
parent b0ee7082

packages/SystemUI/src/com/android/systemui/statusbar/phone/CentralSurfaces.java

+0 −2
Original line number Diff line number Diff line
@@ -323,8 +323,6 @@ public interface CentralSurfaces extends Dumpable, LifecycleOwner { 


    boolean isBouncerShowingOverDream();



    boolean isKeyguardSecure();



    void updateNotificationPanelTouchState();



    int getRotation();

packages/SystemUI/src/com/android/systemui/statusbar/phone/CentralSurfacesEmptyImpl.kt

+0 −1
Original line number Diff line number Diff line
@@ -95,7 +95,6 @@ abstract class CentralSurfacesEmptyImpl : CentralSurfaces { 
    override fun isBouncerShowing() = false

    override fun isBouncerShowingScrimmed() = false

    override fun isBouncerShowingOverDream() = false

    override fun isKeyguardSecure() = false

    override fun updateNotificationPanelTouchState() {}

    override fun getRotation() = 0

    override fun setBarStateForTest(state: Int) {}

packages/SystemUI/src/com/android/systemui/statusbar/phone/CentralSurfacesImpl.java

+2 −7
Original line number Diff line number Diff line
@@ -2486,7 +2486,7 @@ public class CentralSurfacesImpl implements CoreStartable, CentralSurfaces { 
                mStatusBarKeyguardViewManager.reset(true);

            } else if (mState == StatusBarState.KEYGUARD

                    && !mStatusBarKeyguardViewManager.primaryBouncerIsOrWillBeShowing()

                    && isKeyguardSecure()) {

                    && mStatusBarKeyguardViewManager.isSecure()) {

                mStatusBarKeyguardViewManager.showBouncer(true /* scrimmed */);

            }

        }
@@ -2895,7 +2895,7 @@ public class CentralSurfacesImpl implements CoreStartable, CentralSurfaces { 
        if (mDevicePolicyManager.getCameraDisabled(null,

                mLockscreenUserManager.getCurrentUserId())) {

            return false;

        } else if (isKeyguardShowing() && isKeyguardSecure()) {

        } else if (isKeyguardShowing() && mStatusBarKeyguardViewManager.isSecure()) {

            // Check if the admin has disabled the camera specifically for the keyguard

            return (mDevicePolicyManager.getKeyguardDisabledFeatures(null,

                    mLockscreenUserManager.getCurrentUserId())
@@ -3198,11 +3198,6 @@ public class CentralSurfacesImpl implements CoreStartable, CentralSurfaces { 
        return mBouncerShowingOverDream;

    }



    @Override

    public boolean isKeyguardSecure() {

        return mStatusBarKeyguardViewManager.isSecure();

    }



    // End Extra BaseStatusBarMethods.



    boolean isTransientShown() {