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

Commit 77bda58b authored by Oleg Blinnikov's avatar Oleg Blinnikov Committed by Android (Google) Code Review
Browse files

Merge "Expose getDisplayUserRotation in aidl" into main

parents 2161e9de 4dded52a

core/java/android/view/IWindowManager.aidl

+9 −0
Original line number Diff line number Diff line
@@ -290,6 +290,15 @@ interface IWindowManager 
     */

    int getDefaultDisplayRotation();



    /**

     * Retrieve the display user rotation.

     * @param displayId Id of the display

     * @return Rotation one of {@link android.view.Surface#ROTATION_0},

     *        {@link android.view.Surface#ROTATION_90}, {@link android.view.Surface#ROTATION_180},

     *        {@link android.view.Surface#ROTATION_270} or -1 if display is not found.

     */

    int getDisplayUserRotation(int displayId);



    /**

     * Watch the rotation of the specified screen.  Returns the current rotation,

     * calls back when it changes.

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

+2 −1
Original line number Diff line number Diff line
@@ -4519,7 +4519,8 @@ public class WindowManagerService extends IWindowManager.Stub 
        }

    }



    int getDisplayUserRotation(int displayId) {

    @Override

    public int getDisplayUserRotation(int displayId) {

        synchronized (mGlobalLock) {

            final DisplayContent display = mRoot.getDisplayContent(displayId);

            if (display == null) {