[automerger] DO NOT MERGE Disable changing lock when device is not provisioned. am...

Change-Id: If73d439ccad4d5a317de59de48427e6f406f1fa2

diff --cc src/com/android/settings/ChooseLockGeneric.java
index 8d0e2ef,0b21119..d4de158
--- 1/src/com/android/settings/ChooseLockGeneric.java
--- 2/src/com/android/settings/ChooseLockGeneric.java
+++ b/src/com/android/settings/ChooseLockGeneric.java
@@@ -140,8 -130,12 +140,13 @@@ public class ChooseLockGeneric extends 
          @Override
          public void onCreate(Bundle savedInstanceState) {
              super.onCreate(savedInstanceState);
+             final Activity activity = getActivity();
+             if (!Utils.isDeviceProvisioned(activity) && !canRunBeforeDeviceProvisioned()) {
+                 activity.finish();
+                 return;
+             }
  
 +            String chooseLockAction = getActivity().getIntent().getAction();
              mFingerprintManager =
                  (FingerprintManager) getActivity().getSystemService(Context.FINGERPRINT_SERVICE);
              mDPM = (DevicePolicyManager) getSystemService(Context.DEVICE_POLICY_SERVICE);

diff --cc src/com/android/settings/SettingsActivity.java
index 9245003,60b43a9..3e338c8
--- 1/src/com/android/settings/SettingsActivity.java
--- 2/src/com/android/settings/SettingsActivity.java
+++ b/src/com/android/settings/SettingsActivity.java
@@@ -626,15 -621,9 +626,15 @@@ public class SettingsActivity extends S
                  // No UP affordance if we are displaying the main Dashboard
                  mDisplayHomeAsUpEnabled = false;
                  // Show Search affordance
-                 mDisplaySearch = true;
+                 mDisplaySearch = Utils.isDeviceProvisioned(this);
                  mInitialTitleResId = R.string.dashboard_title;
 -                switchToFragment(DashboardContainerFragment.class.getName(), null, false, false,
 +
 +                // add argument to indicate which settings tab should be initially selected
 +                final Bundle args = new Bundle();
 +                final String extraName = DashboardContainerFragment.EXTRA_SELECT_SETTINGS_TAB;
 +                args.putString(extraName, intent.getStringExtra(extraName));
 +
 +                switchToFragment(DashboardContainerFragment.class.getName(), args, false, false,
                          mInitialTitleResId, mInitialTitle, false);
              }
          }