Only show camera widget to setup users.
And remove misspelled and unused field in KeyguardHostView.
Bug:7645811
Change-Id: I3d6ceae8d25d0af7b504b4c22782611d25462a62
diff --git a/policy/src/com/android/internal/policy/impl/keyguard/KeyguardHostView.java b/policy/src/com/android/internal/policy/impl/keyguard/KeyguardHostView.java
index 1b7626e..4fb7a61 100644
--- a/policy/src/com/android/internal/policy/impl/keyguard/KeyguardHostView.java
+++ b/policy/src/com/android/internal/policy/impl/keyguard/KeyguardHostView.java
@@ -92,8 +92,6 @@
private KeyguardSecurityModel mSecurityModel;
private KeyguardViewStateManager mViewStateManager;
- boolean mPersitentStickyWidgetLoaded = false;
-
private Rect mTempRect = new Rect();
private int mDisabledFeatures;
@@ -1088,7 +1086,7 @@
// 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);