diff options
| author | Jeff Brown <jeffbrown@google.com> | 2012-10-01 11:35:53 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2012-10-01 11:35:55 -0700 |
| commit | 5e3dcf7210bed65d8f9aec40d9da078daf76dead (patch) | |
| tree | ecab98553eecca1c18f3f2337d153a58e7fdcf08 /core/java/android | |
| parent | c56e5600501a5c376dc13e6a99fcec7782fc8718 (diff) | |
| parent | edce6a797878792de2b0bde4360f3171b9e9d9d2 (diff) | |
Merge "Remove clearUserActivityTimeout()." into jb-mr1-dev
Diffstat (limited to 'core/java/android')
| -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 8bfefd40f6c9..5345a6d6e5c3 100644 --- a/core/java/android/os/IPowerManager.aidl +++ b/core/java/android/os/IPowerManager.aidl @@ -40,7 +40,6 @@ interface IPowerManager void reboot(String reason); void crash(String message); - void clearUserActivityTimeout(long now, long timeout); void setPokeLock(int pokey, IBinder lock, String tag); void setStayOnSetting(int val); void setMaximumScreenOffTimeoutFromDeviceAdmin(int timeMs); |