Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 5e3dcf72 authored by Jeff Brown's avatar Jeff Brown Committed by Android (Google) Code Review
Browse files

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

parents c56e5600 edce6a79

core/java/android/os/IPowerManager.aidl

+0 −1
Original line number Diff line number Diff line
@@ -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

+0 −6
Original line number Diff line number Diff line
@@ -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

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

+0 −5
Original line number Diff line number Diff line
@@ -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.