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

Commit fe7e94a0 authored by Jim Miller's avatar Jim Miller Committed by Android Git Automerger
Browse files

am 088fb915: Merge "Add isSafeModeEnabled() API to WindowManagerService" into jb-mr1-lockscreen-dev 

* commit '088fb915':
  Add isSafeModeEnabled() API to WindowManagerService
parents 2f4be247 088fb915

core/java/android/view/IWindowManager.aidl

+5 −0
Original line number Original line Diff line number Diff line
@@ -254,4 +254,9 @@ interface IWindowManager 
     * Gets the infos for all visible windows.

     * Gets the infos for all visible windows.

     */

     */

    void getVisibleWindowsForDisplay(int displayId, out List<WindowInfo> outInfos);

    void getVisibleWindowsForDisplay(int displayId, out List<WindowInfo> outInfos);



    /**

     * Device is in safe mode.

     */

    boolean isSafeModeEnabled();

}
 
}

services/java/com/android/server/wm/WindowManagerService.java

+4 −0
Original line number Original line Diff line number Diff line
@@ -10348,6 +10348,10 @@ public class WindowManagerService extends IWindowManager.Stub 
        mPolicy.lockNow(options);

        mPolicy.lockNow(options);

    }

    }

    

    

    public boolean isSafeModeEnabled() {

        return mSafeMode;

    }



    void dumpPolicyLocked(PrintWriter pw, String[] args, boolean dumpAll) {

    void dumpPolicyLocked(PrintWriter pw, String[] args, boolean dumpAll) {

        pw.println("WINDOW MANAGER POLICY STATE (dumpsys window policy)");

        pw.println("WINDOW MANAGER POLICY STATE (dumpsys window policy)");

        mPolicy.dump("    ", pw, args);

        mPolicy.dump("    ", pw, args);

tools/layoutlib/bridge/src/android/view/IWindowManagerImpl.java

+5 −0
Original line number Original line Diff line number Diff line
@@ -447,6 +447,11 @@ public class IWindowManagerImpl implements IWindowManager { 
        // TODO Auto-generated method stub

        // TODO Auto-generated method stub

    }

    }

    

    

    @Override

    public boolean isSafeModeEnabled() {

        return false;

    }



    @Override

    @Override

    public IBinder getFocusedWindowToken() {

    public IBinder getFocusedWindowToken() {

        // TODO Auto-generated method stub

        // TODO Auto-generated method stub