Merge "Disable car mode should not require DISABLE_KEYGUARD permission"
diff --git a/services/java/com/android/server/UiModeManagerService.java b/services/java/com/android/server/UiModeManagerService.java
index 71826ff..5f23a90 100644
--- a/services/java/com/android/server/UiModeManagerService.java
+++ b/services/java/com/android/server/UiModeManagerService.java
@@ -347,11 +347,13 @@
}
}
if (mKeyguardLock != null) {
+ long ident = Binder.clearCallingIdentity();
if (enabled) {
mKeyguardLock.disableKeyguard();
} else {
mKeyguardLock.reenableKeyguard();
}
+ Binder.restoreCallingIdentity(ident);
}
}
}