drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Remove clearUserActivityTimeout()." into jb-mr1-dev

Browse Source
This commit is contained in:
Jeff Brown
2012-10-01 11:35:53 -07:00
committed by Android (Google) Code Review
parent c56e560050 edce6a7978
commit 5e3dcf7210
3 changed files with 0 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
core/java/android/os/IPowerManager.aidl
View File

@ -40,7 +40,6 @@ interface IPowerManager
void reboot(String reason); void reboot(String reason);
void crash(String message); void crash(String message);
void clearUserActivityTimeout(long now, long timeout);
void setPokeLock(int pokey, IBinder lock, String tag); void setPokeLock(int pokey, IBinder lock, String tag);
void setStayOnSetting(int val); void setStayOnSetting(int val);
void setMaximumScreenOffTimeoutFromDeviceAdmin(int timeMs); void setMaximumScreenOffTimeoutFromDeviceAdmin(int timeMs);

6
services/java/com/android/server/power/PowerManagerService.java
View File

@ -1573,12 +1573,6 @@ public final class PowerManagerService extends IPowerManager.Stub
} }
} }
@Override // Binder call
public void clearUserActivityTimeout(long now, long timeout) {
// TODO Auto-generated method stub
// Only used by phone app, delete this
}
@Override // Binder call @Override // Binder call
public void setPokeLock(int pokey, IBinder lock, String tag) { public void setPokeLock(int pokey, IBinder lock, String tag) {
// TODO Auto-generated method stub // TODO Auto-generated method stub

5
tools/layoutlib/bridge/src/com/android/layoutlib/bridge/android/BridgePowerManager.java
View File

@ -44,11 +44,6 @@ public class BridgePowerManager implements IPowerManager {
// pass for now. // pass for now.
} }
@Override
public void clearUserActivityTimeout(long arg0, long arg1) throws RemoteException {
// pass for now.
}
@Override @Override
public void crash(String arg0) throws RemoteException { public void crash(String arg0) throws RemoteException {
// pass for now. // pass for now.