diff options
| author | Jeff Brown <jeffbrown@google.com> | 2012-09-28 19:05:51 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2012-09-28 19:05:52 -0700 |
| commit | 7f813202cb08a829b59e17be749ffee4a2f482b8 (patch) | |
| tree | ba01fd0aa6afe448c6d7304fb957810aa571317d /core/java | |
| parent | 7c3586c576c7f7238274f1ffbc4577a57be0d1f1 (diff) | |
| parent | 120664816a9bf325b618d8dd40febae2e3636ec8 (diff) | |
| download | frameworks_base-7f813202cb08a829b59e17be749ffee4a2f482b8.zip frameworks_base-7f813202cb08a829b59e17be749ffee4a2f482b8.tar.gz frameworks_base-7f813202cb08a829b59e17be749ffee4a2f482b8.tar.bz2 | |
Merge "Get rid of preventScreenOn()." into jb-mr1-dev
Diffstat (limited to 'core/java')
| -rw-r--r-- | core/java/android/os/IPowerManager.aidl | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/core/java/android/os/IPowerManager.aidl b/core/java/android/os/IPowerManager.aidl index eec19cb..8bfefd4 100644 --- a/core/java/android/os/IPowerManager.aidl +++ b/core/java/android/os/IPowerManager.aidl @@ -44,7 +44,6 @@ interface IPowerManager void setPokeLock(int pokey, IBinder lock, String tag); void setStayOnSetting(int val); void setMaximumScreenOffTimeoutFromDeviceAdmin(int timeMs); - void preventScreenOn(boolean prevent); // temporarily overrides the screen brightness settings to allow the user to // see the effect of a settings change without applying it immediately |