Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Don't dismiss keyguard when enabling it" into qt-dev

Browse Source 
am: 785a88846a

Change-Id: I08ac9f6aa9bec70f0248cca128dba466c2754d82
This commit is contained in:
Ivan Podogov
2019-06-24 12:49:43 -07:00
committed by android-build-merger
parent 8ca77b32f0 785a88846a
commit ecfa99dab7
1 changed files with 5 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java
View File

@@ -11018,7 +11018,11 @@ public class DevicePolicyManagerService extends BaseIDevicePolicyManager {
return false; return false;
} }
mLockPatternUtils.setLockScreenDisabled(disabled, userId); mLockPatternUtils.setLockScreenDisabled(disabled, userId);
mInjector.getIWindowManager().dismissKeyguard(null /* callback */, null /* message */); if (disabled) {
mInjector
.getIWindowManager()
.dismissKeyguard(null /* callback */, null /* message */);
}
DevicePolicyEventLogger DevicePolicyEventLogger
.createEvent(DevicePolicyEnums.SET_KEYGUARD_DISABLED) .createEvent(DevicePolicyEnums.SET_KEYGUARD_DISABLED)
.setAdmin(who) .setAdmin(who)