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

Commit 597820a6 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "DO NOT MERGE Disable changing lock when device is not provisioned." into nyc-mr1-dev

parents 782fc16d cd0b97e8

src/com/android/settings/ChooseLockGeneric.java

+1 −0
Original line number Diff line number Diff line
@@ -51,6 +51,7 @@ import android.widget.TextView; 


import com.android.internal.logging.MetricsProto.MetricsEvent;

import com.android.internal.widget.LockPatternUtils;

import com.android.settings.Utils;

import com.android.settings.fingerprint.FingerprintEnrollBase;

import com.android.settings.fingerprint.FingerprintEnrollFindSensor;

import com.android.settingslib.RestrictedLockUtils;

src/com/android/settings/SettingsActivity.java

+1 −1
Original line number Diff line number Diff line
@@ -708,7 +708,7 @@ public class SettingsActivity extends SettingsDrawerActivity 
    }



    public void setDisplaySearchMenu(boolean displaySearch) {

        if (displaySearch != mDisplaySearch) {

        if (Utils.isDeviceProvisioned(this) && displaySearch != mDisplaySearch) {

            mDisplaySearch = displaySearch;

            invalidateOptionsMenu();

        }