diff options
| author | Jeff Brown <jeffbrown@google.com> | 2014-08-21 18:01:51 -0700 |
|---|---|---|
| committer | Jeff Brown <jeffbrown@google.com> | 2014-08-21 22:20:48 -0700 |
| commit | a71f03c48160ee82aad8d05edeb39faaf95ae137 (patch) | |
| tree | 23304d3e9cee23de2123aad75b9f92182526aaea /core/java | |
| parent | bc070818271981df5a475666f005aa2084a2c40b (diff) | |
| download | frameworks_base-a71f03c48160ee82aad8d05edeb39faaf95ae137.zip frameworks_base-a71f03c48160ee82aad8d05edeb39faaf95ae137.tar.gz frameworks_base-a71f03c48160ee82aad8d05edeb39faaf95ae137.tar.bz2 | |
Unhide the proximity sensor wakelock.
Bug: 5354313
Change-Id: I59c6bfcd8ff2cebe264f69c49032737a45326373
Diffstat (limited to 'core/java')
| -rw-r--r-- | core/java/android/os/PowerManager.java | 15 |
1 files changed, 4 insertions, 11 deletions
diff --git a/core/java/android/os/PowerManager.java b/core/java/android/os/PowerManager.java index 75f8279..b167549 100644 --- a/core/java/android/os/PowerManager.java +++ b/core/java/android/os/PowerManager.java @@ -186,8 +186,6 @@ public final class PowerManager { * </p><p> * Cannot be used with {@link #ACQUIRE_CAUSES_WAKEUP}. * </p> - * - * {@hide} */ public static final int PROXIMITY_SCREEN_OFF_WAKE_LOCK = 0x00000020; @@ -243,11 +241,9 @@ public final class PowerManager { public static final int UNIMPORTANT_FOR_LOGGING = 0x40000000; /** - * Flag for {@link WakeLock#release release(int)} to defer releasing a - * {@link #PROXIMITY_SCREEN_OFF_WAKE_LOCK} wake lock until the proximity sensor returns - * a negative value. - * - * {@hide} + * Flag for {@link WakeLock#release WakeLock.release(int)}: Defer releasing a + * {@link #PROXIMITY_SCREEN_OFF_WAKE_LOCK} wake lock until the proximity sensor + * indicates that an object is not in close proximity. */ public static final int WAIT_FOR_PROXIMITY_NEGATIVE = 1; @@ -456,6 +452,7 @@ public final class PowerManager { * @see #FULL_WAKE_LOCK * @see #SCREEN_DIM_WAKE_LOCK * @see #SCREEN_BRIGHT_WAKE_LOCK + * @see #PROXIMITY_SCREEN_OFF_WAKE_LOCK * @see #ACQUIRE_CAUSES_WAKEUP * @see #ON_AFTER_RELEASE */ @@ -619,8 +616,6 @@ public final class PowerManager { * * @param level The wake lock level to check. * @return True if the specified wake lock level is supported. - * - * {@hide} */ public boolean isWakeLockLevelSupported(int level) { try { @@ -893,8 +888,6 @@ public final class PowerManager { * * @param flags Combination of flag values to modify the release behavior. * Currently only {@link #WAIT_FOR_PROXIMITY_NEGATIVE} is supported. - * - * {@hide} */ public void release(int flags) { synchronized (mToken) { |