diff options
| author | Mike Lockwood <lockwood@android.com> | 2009-11-20 09:56:25 -0800 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2009-11-20 09:56:25 -0800 |
| commit | 9d633968ceb502e95f9785b169742624f72614f5 (patch) | |
| tree | efc707137e6fda7ae1d440b5e6bba4162ce2d6ca /core | |
| parent | 12c90b0525d8e97a2fae060f95e9761c0c48c26d (diff) | |
| parent | 401a712e3b3b41c77e79a130d7b07d653e18bcab (diff) | |
| download | frameworks_base-9d633968ceb502e95f9785b169742624f72614f5.zip frameworks_base-9d633968ceb502e95f9785b169742624f72614f5.tar.gz frameworks_base-9d633968ceb502e95f9785b169742624f72614f5.tar.bz2 | |
am 401a712e: IPowerManager: remove some unused methods.
Merge commit '401a712e3b3b41c77e79a130d7b07d653e18bcab' into eclair-mr2-plus-aosp
* commit '401a712e3b3b41c77e79a130d7b07d653e18bcab':
IPowerManager: remove some unused methods.
Diffstat (limited to 'core')
| -rw-r--r-- | core/java/android/os/IPowerManager.aidl | 2 | ||||
| -rw-r--r-- | core/java/android/os/LocalPowerManager.java | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/core/java/android/os/IPowerManager.aidl b/core/java/android/os/IPowerManager.aidl index 0229864..70a634f 100644 --- a/core/java/android/os/IPowerManager.aidl +++ b/core/java/android/os/IPowerManager.aidl @@ -28,9 +28,7 @@ interface IPowerManager void setPokeLock(int pokey, IBinder lock, String tag); int getSupportedWakeLockFlags(); void setStayOnSetting(int val); - long getScreenOnTime(); void preventScreenOn(boolean prevent); - void setScreenBrightnessOverride(int brightness); boolean isScreenOn(); void reboot(String reason); diff --git a/core/java/android/os/LocalPowerManager.java b/core/java/android/os/LocalPowerManager.java index 3fe21d9..03331aa 100644 --- a/core/java/android/os/LocalPowerManager.java +++ b/core/java/android/os/LocalPowerManager.java @@ -44,7 +44,9 @@ public interface LocalPowerManager { void enableUserActivity(boolean enabled); // the same as the method on PowerManager - public void userActivity(long time, boolean noChangeLights, int eventType); + void userActivity(long time, boolean noChangeLights, int eventType); boolean isScreenOn(); + + void setScreenBrightnessOverride(int brightness); } |