am 5e3dcf72: Merge "Remove clearUserActivityTimeout()." into jb-mr1-dev

* commit '5e3dcf7210bed65d8f9aec40d9da078daf76dead':
  Remove clearUserActivityTimeout().
This commit is contained in:
Jeff Brown
2012-10-01 11:39:30 -07:00
committed by Android Git Automerger
3 changed files with 0 additions and 12 deletions

View File

@@ -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);

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
public void setPokeLock(int pokey, IBinder lock, String tag) {
// TODO Auto-generated method stub

View File

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