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

Commit 6d2248f5 authored by Evan Rosky's avatar Evan Rosky Committed by Automerger Merge Worker
Browse files

Merge "Display-level relative display rotation should be 0" into tm-qpr-dev am: e0e646c4 

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/20085585



Change-Id: I30312c4b84a20b0f188ab5325ed9914f07105605
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 281e7f69 e0e646c4

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

+7 −0
Original line number Original line Diff line number Diff line
@@ -6729,4 +6729,11 @@ class DisplayContent extends RootDisplayArea implements WindowManagerPolicy.Disp 
    DisplayContent asDisplayContent() {

    DisplayContent asDisplayContent() {

        return this;

        return this;

    }

    }



    @Override

    @Surface.Rotation

    int getRelativeDisplayRotation() {

        // Display is the root, so it's not rotated relative to anything.

        return Surface.ROTATION_0;

    }

}
 
}