OSDN Git Service

[automerger] DO NOT MERGE Disable changing lock when device is not provisioned. am...
authorAndroid Build Merger (Role) <noreply-android-build-merger@google.com>
Fri, 3 Aug 2018 21:04:04 +0000 (21:04 +0000)
committerAndroid Build Merger (Role) <noreply-android-build-merger@google.com>
Fri, 3 Aug 2018 21:04:04 +0000 (21:04 +0000)
commitc056ac3011098fb63685bf2d9758afd5d323db1d
tree4da507af32e37f66dc47b85711b0a48faec16aa4
parent5388f7b1bc58dce7d465080055a745a4a38788a5
parentc624deaff5b00cf4e4dda87cb48b35200b2a1469
[automerger] DO NOT MERGE Disable changing lock when device is not provisioned. am: c624deaff5

Change-Id: I8b74b9105db55d8b8cdb3f7bc7b8b42ee9998de8
src/com/android/settings/ChooseLockGeneric.java
src/com/android/settings/SettingsActivity.java
src/com/android/settings/SetupChooseLockGeneric.java