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

Commit 368016f7 authored by John Spurlock's avatar John Spurlock Committed by Android Git Automerger
Browse files

am bd0e1808: am 4015c3f8: Merge "Only show camera widget to setup users." into jb-mr1.1-dev 

* commit 'bd0e1808':
  Only show camera widget to setup users.
parents 57b47ae9 bd0e1808

policy/src/com/android/internal/policy/impl/keyguard/KeyguardHostView.java

+1 −3
Original line number Diff line number Diff line
@@ -92,8 +92,6 @@ public class KeyguardHostView extends KeyguardViewBase { 
    private KeyguardSecurityModel mSecurityModel;

    private KeyguardViewStateManager mViewStateManager;



    boolean mPersitentStickyWidgetLoaded = false;



    private Rect mTempRect = new Rect();



    private int mDisabledFeatures;
@@ -1088,7 +1086,7 @@ public class KeyguardHostView extends KeyguardViewBase { 
        // We currently disable cameras in safe mode because we support loading 3rd party

        // cameras we can't trust.  TODO: plumb safe mode into camera creation code and only

        // inflate system-provided camera?

        if (!mSafeModeEnabled && !cameraDisabledByDpm()

        if (!mSafeModeEnabled && !cameraDisabledByDpm() && mUserSetupCompleted

                && mContext.getResources().getBoolean(R.bool.kg_enable_camera_default_widget)) {

            View cameraWidget =

                    CameraWidgetFrame.create(mContext, mCameraWidgetCallbacks, mActivityLauncher);