diff options
Diffstat (limited to 'core/java')
| -rw-r--r-- | core/java/android/os/PowerManagerInternal.java | 6 | ||||
| -rw-r--r-- | core/java/android/view/KeyEvent.java | 4 |
2 files changed, 1 insertions, 9 deletions
diff --git a/core/java/android/os/PowerManagerInternal.java b/core/java/android/os/PowerManagerInternal.java index 70cff00636ac..e742f989c500 100644 --- a/core/java/android/os/PowerManagerInternal.java +++ b/core/java/android/os/PowerManagerInternal.java @@ -108,12 +108,6 @@ public abstract class PowerManagerInternal { public abstract void setUserActivityTimeoutOverrideFromWindowManager(long timeoutMillis); /** - * Used by the window manager to tell the power manager that the user is no longer actively - * using the device. - */ - public abstract void setUserInactiveOverrideFromWindowManager(); - - /** * Used by device administration to set the maximum screen off timeout. * * This method must only be called by the device administration policy manager. diff --git a/core/java/android/view/KeyEvent.java b/core/java/android/view/KeyEvent.java index 2bd319c0ba80..52852e7b6e97 100644 --- a/core/java/android/view/KeyEvent.java +++ b/core/java/android/view/KeyEvent.java @@ -784,10 +784,8 @@ public class KeyEvent extends InputEvent implements Parcelable { /** Key code constant: Step backward media key. * Steps media backward, one frame at a time. */ public static final int KEYCODE_MEDIA_STEP_BACKWARD = 275; - /** Key code constant: put device to sleep unless a wakelock is held. */ - public static final int KEYCODE_SOFT_SLEEP = 276; - private static final int LAST_KEYCODE = KEYCODE_SOFT_SLEEP; + private static final int LAST_KEYCODE = KEYCODE_MEDIA_STEP_BACKWARD; // NOTE: If you add a new keycode here you must also add it to: // isSystem() |