OSDN Git Service

Ask profile password before unifying to prevent untrusted reset
authorPavel Grafov <pgrafov@google.com>
Wed, 20 Jun 2018 16:20:05 +0000 (17:20 +0100)
committerPavel Grafov <pgrafov@google.com>
Fri, 6 Jul 2018 13:40:10 +0000 (14:40 +0100)
commit80d9020cc2011b4a4c84c089c452b253546a2a91
treed26a74df7af4ade179ac3d0646a5f7668d33b470
parent87007778393facface3753401ac8d830280485fa
Ask profile password before unifying to prevent untrusted reset

Test: make -j RunSettingsRoboTests
Test: manual, unify when profile lock is compliant
Test: manual, unify when profile lock is not compliant
Test: manual, unify when profile lock is empty
Fixes: 110262879

Change-Id: I0dfa885f2a0e44e09c217b3e7766b367f1340c9e
src/com/android/settings/security/LockUnificationPreferenceController.java
src/com/android/settings/security/SecuritySettings.java
src/com/android/settings/security/UnificationConfirmationDialog.java
tests/robotests/src/com/android/settings/security/LockUnificationPreferenceControllerTest.java