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

Commit bc1d6d5d authored by Chris Li's avatar Chris Li Committed by Android (Google) Code Review
Browse files

Merge "Expose WindowCongifuration#getDisplayRotation as TestApi" into main

parents bc624428 3456e4c9

core/api/test-current.txt

+1 −0
Original line number Diff line number Diff line
@@ -510,6 +510,7 @@ package android.app { 
    method public int getActivityType();

    method @Nullable public android.graphics.Rect getAppBounds();

    method @NonNull public android.graphics.Rect getBounds();

    method public int getDisplayRotation();

    method @NonNull public android.graphics.Rect getMaxBounds();

    method public int getRotation();

    method public int getWindowingMode();

core/java/android/app/WindowConfiguration.java

+4 −3
Original line number Diff line number Diff line
@@ -27,6 +27,7 @@ import static android.view.Surface.rotationToString; 
import android.annotation.IntDef;

import android.annotation.NonNull;

import android.annotation.Nullable;

import android.annotation.SuppressLint;

import android.annotation.TestApi;

import android.compat.annotation.UnsupportedAppUsage;

import android.content.res.Configuration;
@@ -326,7 +327,7 @@ public class WindowConfiguration implements Parcelable, Comparable<WindowConfigu 
    }



    /**

     * Sets the apparent display cutout.

     * Sets the display rotation.

     * @hide

     */

    public void setDisplayRotation(@Surface.Rotation int rotation) {
@@ -386,9 +387,9 @@ public class WindowConfiguration implements Parcelable, Comparable<WindowConfigu 
    }



    /**

     * @see #setDisplayRotation

     * @hide

     * Gets the display rotation.

     */

    @SuppressLint("UnflaggedApi") // @TestApi without associated feature.

    public @Surface.Rotation int getDisplayRotation() {

        return mDisplayRotation;

    }