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

Commit 401a712e authored by Mike Lockwood's avatar Mike Lockwood
Browse files

IPowerManager: remove some unused methods. 



Change-Id: I7c7fa7eaf6c99e723da20939c27fbc172ad51613
Signed-off-by: default avatarMike Lockwood <lockwood@android.com>
parent aa5e25d2

core/java/android/os/IPowerManager.aidl

+0 −2
Original line number Diff line number Diff line
@@ -28,9 +28,7 @@ interface IPowerManager 
    void setPokeLock(int pokey, IBinder lock, String tag);

    int getSupportedWakeLockFlags();

    void setStayOnSetting(int val);

    long getScreenOnTime();

    void preventScreenOn(boolean prevent);

    void setScreenBrightnessOverride(int brightness);

    boolean isScreenOn();

    void reboot(String reason);

core/java/android/os/LocalPowerManager.java

+3 −1
Original line number Diff line number Diff line
@@ -44,7 +44,9 @@ public interface LocalPowerManager { 
    void enableUserActivity(boolean enabled);



    // the same as the method on PowerManager

    public void userActivity(long time, boolean noChangeLights, int eventType);

    void userActivity(long time, boolean noChangeLights, int eventType);



    boolean isScreenOn();



    void setScreenBrightnessOverride(int brightness);

}

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

+0 −24
Original line number Diff line number Diff line
@@ -216,10 +216,6 @@ class PowerManagerService extends IPowerManager.Stub 
    private volatile boolean mPokeAwakeOnSet = false;

    private volatile boolean mInitComplete = false;

    private HashMap<IBinder,PokeLock> mPokeLocks = new HashMap<IBinder,PokeLock>();

    // mScreenOnTime and mScreenOnStartTime are used for computing total time screen

    // has been on since boot

    private long mScreenOnTime;

    private long mScreenOnStartTime;

    // mLastScreenOnTime is the time the screen was last turned on

    private long mLastScreenOnTime;

    private boolean mPreventScreenOn;
@@ -417,7 +413,6 @@ class PowerManagerService extends IPowerManager.Stub 
        

        // Add ourself to the Watchdog monitors.

        Watchdog.getInstance().addMonitor(this);

        mScreenOnStartTime = SystemClock.elapsedRealtime();

    }



    private ContentQueryMap mSettings;
@@ -1470,7 +1465,6 @@ class PowerManagerService extends IPowerManager.Stub 
                        err = 0;

                    }



                    mScreenOnStartTime = SystemClock.elapsedRealtime();

                    mLastTouchDown = 0;

                    mTotalTouchDownTime = 0;

                    mTouchCycles = 0;
@@ -1513,10 +1507,6 @@ class PowerManagerService extends IPowerManager.Stub 
                mTotalTouchDownTime, mTouchCycles);

        mLastTouchDown = 0;

        int err = setScreenStateLocked(false);

        if (mScreenOnStartTime != 0) {

            mScreenOnTime += SystemClock.elapsedRealtime() - mScreenOnStartTime;

            mScreenOnStartTime = 0;

        }

        if (err == 0) {

            int why = becauseOfUser

                    ? WindowManagerPolicy.OFF_BECAUSE_OF_USER
@@ -2105,20 +2095,6 @@ class PowerManagerService extends IPowerManager.Stub 
        }

    }



    /**

     * Returns the time the screen has been on since boot, in millis.

     * @return screen on time

     */

    public long getScreenOnTime() {

        synchronized (mLocks) {

            if (mScreenOnStartTime == 0) {

                return mScreenOnTime;

            } else {

                return SystemClock.elapsedRealtime() - mScreenOnStartTime + mScreenOnTime;

            }

        }

    }



    private void goToSleepLocked(long time) {



        if (mLastEventTime <= time) {