diff options
| author | Narayan Kamath <narayan@google.com> | 2014-05-21 12:07:35 +0100 |
|---|---|---|
| committer | Narayan Kamath <narayan@google.com> | 2014-05-21 12:07:35 +0100 |
| commit | d862ebb6036a769cb3be371b396e9e33f89ee365 (patch) | |
| tree | ebe36d1f47fc0c58ee0dfa295bb776ea3faad1c0 /services/devicepolicy | |
| parent | 9853e2a8b37c80a11427f48b3b4976408f615e57 (diff) | |
| parent | fcc4fed3c16a57ef713a96b7298ed43aaeef2df4 (diff) | |
| download | frameworks_base-d862ebb6036a769cb3be371b396e9e33f89ee365.zip frameworks_base-d862ebb6036a769cb3be371b396e9e33f89ee365.tar.gz frameworks_base-d862ebb6036a769cb3be371b396e9e33f89ee365.tar.bz2 | |
resolved conflicts for merge of fcc4fed3 to master
Change-Id: Icebca982b01debd67a1470c02651ef8936f6e5b0
Diffstat (limited to 'services/devicepolicy')
| -rw-r--r-- | services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java b/services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java index 5d88a57..58fdcc1 100644 --- a/services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java +++ b/services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java @@ -2301,7 +2301,7 @@ public class DevicePolicyManagerService extends IDevicePolicyManager.Stub { try { // Power off the display getIPowerManager().goToSleep(SystemClock.uptimeMillis(), - PowerManager.GO_TO_SLEEP_REASON_DEVICE_ADMIN); + PowerManager.GO_TO_SLEEP_REASON_DEVICE_ADMIN, 0); // Ensure the device is locked getWindowManager().lockNow(null); } catch (RemoteException e) { |