PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
TreeHugger Robot
2018-08-09 18:43:34 +00:00
committed by Android (Google) Code Review
parent 782fc16dc4 cd0b97e86f
commit 597820a687
2 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/com/android/settings/ChooseLockGeneric.java
View File

@@ -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;

2
src/com/android/settings/SettingsActivity.java
View File

@@ -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();
}