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

Change-Id: I8b74b9105db55d8b8cdb3f7bc7b8b42ee9998de8
This commit is contained in:
Android Build Merger (Role)
2018-08-03 21:04:04 +00:00
3 changed files with 15 additions and 1 deletions

View File

@@ -130,6 +130,11 @@ public class ChooseLockGeneric extends SettingsActivity {
@Override
public void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
final Activity activity = getActivity();
if (!Utils.isDeviceProvisioned(activity) && !canRunBeforeDeviceProvisioned()) {
activity.finish();
return;
}
mFingerprintManager =
(FingerprintManager) getActivity().getSystemService(Context.FINGERPRINT_SERVICE);
@@ -213,6 +218,10 @@ public class ChooseLockGeneric extends SettingsActivity {
addHeaderView();
}
protected boolean canRunBeforeDeviceProvisioned() {
return false;
}
protected void addHeaderView() {
if (mForFingerprint) {
setHeaderView(R.layout.choose_lock_generic_fingerprint_header);