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

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

Merge "Get rid of preventScreenOn()." into jb-mr1-dev

parents 7c3586c5 12066481

core/java/android/os/IPowerManager.aidl

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

    void setStayOnSetting(int val);

    void setMaximumScreenOffTimeoutFromDeviceAdmin(int timeMs);

    void preventScreenOn(boolean prevent);



    // temporarily overrides the screen brightness settings to allow the user to

    // see the effect of a settings change without applying it immediately

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

+0 −6
Original line number Diff line number Diff line
@@ -1643,12 +1643,6 @@ public final class PowerManagerService extends IPowerManager.Stub 
                && mMaximumScreenOffTimeoutFromDeviceAdmin < Integer.MAX_VALUE;

    }



    @Override // Binder call

    public void preventScreenOn(boolean prevent) {

        // TODO Auto-generated method stub

        // Only used by phone app, delete this

    }



    /**

     * Used by the phone application to make the attention LED flash when ringing.

     */

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

+0 −5
Original line number Diff line number Diff line
@@ -64,11 +64,6 @@ public class BridgePowerManager implements IPowerManager { 
        // pass for now.

    }



    @Override

    public void preventScreenOn(boolean arg0) throws RemoteException {

        // pass for now.

    }



    @Override

    public void reboot(String arg0) throws RemoteException {

        // pass for now.