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

Author: Jeff Brown

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

services/java/com/android/server/power/PowerManagerService.java

@@ -1573,12 +1573,6 @@ public void run() {
         }
     }
 
-    @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

tools/layoutlib/bridge/src/com/android/layoutlib/bridge/android/BridgePowerManager.java

@@ -44,11 +44,6 @@ public void acquireWakeLock(IBinder arg0, int arg1, String arg2, WorkSource arg3
         // 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.