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 /core/java/android/os | |
| 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 'core/java/android/os')
| -rw-r--r-- | core/java/android/os/IPowerManager.aidl | 2 | ||||
| -rw-r--r-- | core/java/android/os/PowerManager.java | 15 |
2 files changed, 15 insertions, 2 deletions
diff --git a/core/java/android/os/IPowerManager.aidl b/core/java/android/os/IPowerManager.aidl index 6c7b08d..61194e9 100644 --- a/core/java/android/os/IPowerManager.aidl +++ b/core/java/android/os/IPowerManager.aidl @@ -38,7 +38,7 @@ interface IPowerManager void userActivity(long time, int event, int flags); void wakeUp(long time); - void goToSleep(long time, int reason); + void goToSleep(long time, int reason, int flags); void nap(long time); boolean isInteractive(); diff --git a/core/java/android/os/PowerManager.java b/core/java/android/os/PowerManager.java index 5b2c8db..d5177e8 100644 --- a/core/java/android/os/PowerManager.java +++ b/core/java/android/os/PowerManager.java @@ -321,6 +321,12 @@ public final class PowerManager { */ public static final String REBOOT_RECOVERY = "recovery"; + /** + * Go to sleep flag: Skip dozing state and directly go to full sleep. + * @hide + */ + public static final int GO_TO_SLEEP_FLAG_NO_DOZE = 1 << 0; + final Context mContext; final IPowerManager mService; final Handler mHandler; @@ -500,8 +506,15 @@ public final class PowerManager { * @see #wakeUp */ public void goToSleep(long time) { + goToSleep(time, GO_TO_SLEEP_REASON_USER, 0); + } + + /** + * @hide + */ + public void goToSleep(long time, int reason, int flags) { try { - mService.goToSleep(time, GO_TO_SLEEP_REASON_USER); + mService.goToSleep(time, reason, flags); } catch (RemoteException e) { } } |