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

Commit 200431be authored by Mariia Sandrikova's avatar Mariia Sandrikova
Browse files

DO NOT MERGE Clean up ADB commands for letterbox and display API sandboxing. 

Changes that introduced these commands: ag/13754186 and ag/14161637.

Fix: 184936789
Test: atest WmTests:SizeCompatTests
Change-Id: Ic834525078931b4928b2144fb6be8ce2e683b38b
parent 216d32af

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

+0 −4
Original line number Diff line number Diff line
@@ -7504,10 +7504,6 @@ final class ActivityRecord extends WindowToken implements WindowManagerService.A 
        if (getUid() == SYSTEM_UID) {

            return false;

        }

        // Do not sandbox to activity window bounds if the feature is disabled.

        if (mDisplayContent != null && !mDisplayContent.sandboxDisplayApis()) {

            return false;

        }

        // Never apply sandboxing to an app that should be explicitly excluded from the config.

        if (info != null && info.neverSandboxDisplayApis()) {

            return false;

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

+0 −22
Original line number Diff line number Diff line
@@ -357,13 +357,6 @@ class DisplayContent extends RootDisplayArea implements WindowManagerPolicy.Disp 
    int mBaseDisplayHeight = 0;

    boolean mIsSizeForced = false;



    /**

     * Overridden display size and metrics to activity window bounds. Set via

     * "adb shell wm set-sandbox-display-apis". Default to true, since only disable for debugging.

     * @see WindowManagerService#setSandboxDisplayApis(int, boolean)

     */

    private boolean mSandboxDisplayApis = true;



    /**

     * Overridden display density for current user. Initialized with {@link #mInitialDisplayDensity}

     * but can be set from Settings or via shell command "adb shell wm density".
@@ -5810,21 +5803,6 @@ class DisplayContent extends RootDisplayArea implements WindowManagerPolicy.Disp 
        return true;

    }



    /**

     * Sets if Display APIs should be sandboxed to the activity window bounds.

     */

    void setSandboxDisplayApis(boolean sandboxDisplayApis) {

        mSandboxDisplayApis = sandboxDisplayApis;

    }



    /**

     * Returns {@code true} is Display APIs should be sandboxed to the activity window bounds,

     * {@code false} otherwise. Default to true, unless set for debugging purposes.

     */

    boolean sandboxDisplayApis() {

        return mSandboxDisplayApis;

    }



    /** The entry for proceeding to handle {@link #mFixedRotationLaunchingApp}. */

    class FixedRotationTransitionListener extends WindowManagerInternal.AppTransitionListener {

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

+3 −112
Original line number Diff line number Diff line
@@ -21,6 +21,7 @@ import android.content.Context; 
import android.graphics.Color;



import com.android.internal.R;

import com.android.internal.annotations.VisibleForTesting;



import java.lang.annotation.Retention;

import java.lang.annotation.RetentionPolicy;
@@ -104,19 +105,11 @@ final class LetterboxConfiguration { 
     * com.android.internal.R.dimen.config_fixedOrientationLetterboxAspectRatio} will be ignored and

     * the framework implementation will be used to determine the aspect ratio.

     */

    @VisibleForTesting

    void setFixedOrientationLetterboxAspectRatio(float aspectRatio) {

        mFixedOrientationLetterboxAspectRatio = aspectRatio;

    }



    /**

     * Resets the aspect ratio of letterbox for fixed orientation to {@link

     * com.android.internal.R.dimen.config_fixedOrientationLetterboxAspectRatio}.

     */

    void resetFixedOrientationLetterboxAspectRatio() {

        mFixedOrientationLetterboxAspectRatio = mContext.getResources().getFloat(

                com.android.internal.R.dimen.config_fixedOrientationLetterboxAspectRatio);

    }



    /**

     * Gets the aspect ratio of letterbox for fixed orientation.

     */
@@ -124,25 +117,6 @@ final class LetterboxConfiguration { 
        return mFixedOrientationLetterboxAspectRatio;

    }



    /**

     * Overrides corners raidus for activities presented in the letterbox mode. If given value < 0,

     * both it and a value of {@link

     * com.android.internal.R.integer.config_letterboxActivityCornersRadius} will be ignored and

     * and corners of the activity won't be rounded.

     */

    void setLetterboxActivityCornersRadius(int cornersRadius) {

        mLetterboxActivityCornersRadius = cornersRadius;

    }



    /**

     * Resets corners raidus for activities presented in the letterbox mode to {@link

     * com.android.internal.R.integer.config_letterboxActivityCornersRadius}.

     */

    void resetLetterboxActivityCornersRadius() {

        mLetterboxActivityCornersRadius = mContext.getResources().getInteger(

                com.android.internal.R.integer.config_letterboxActivityCornersRadius);

    }



    /**

     * Whether corners of letterboxed activities are rounded.

     */
@@ -166,25 +140,6 @@ final class LetterboxConfiguration { 
        return mLetterboxBackgroundColor;

    }





    /**

     * Sets color of letterbox background which is used when {@link

     * #getLetterboxBackgroundType()} is {@link #LETTERBOX_BACKGROUND_SOLID_COLOR} or as

     * fallback for other backfround types.

     */

    void setLetterboxBackgroundColor(Color color) {

        mLetterboxBackgroundColor = color;

    }



    /**

     * Resets color of letterbox background to {@link

     * com.android.internal.R.color.config_letterboxBackgroundColor}.

     */

    void resetLetterboxBackgroundColor() {

        mLetterboxBackgroundColor = Color.valueOf(mContext.getResources().getColor(

                com.android.internal.R.color.config_letterboxBackgroundColor));

    }



    /**

     * Gets {@link LetterboxBackgroundType} specified in {@link

     * com.android.internal.R.integer.config_letterboxBackgroundType} or over via ADB command.
@@ -194,19 +149,6 @@ final class LetterboxConfiguration { 
        return mLetterboxBackgroundType;

    }



    /** Sets letterbox background type. */

    void setLetterboxBackgroundType(@LetterboxBackgroundType int backgroundType) {

        mLetterboxBackgroundType = backgroundType;

    }



    /**

     * Resets cletterbox background type to {@link

     * com.android.internal.R.integer.config_letterboxBackgroundType}.

     */

    void resetLetterboxBackgroundType() {

        mLetterboxBackgroundType = readLetterboxBackgroundTypeFromConfig(mContext);

    }



    /** Returns a string representing the given {@link LetterboxBackgroundType}. */

    static String letterboxBackgroundTypeToString(

            @LetterboxBackgroundType int backgroundType) {
@@ -235,27 +177,6 @@ final class LetterboxConfiguration { 
                    ? backgroundType : LETTERBOX_BACKGROUND_SOLID_COLOR;

    }



    /**

     * Overrides alpha of a black scrim shown over wallpaper for {@link

     * #LETTERBOX_BACKGROUND_WALLPAPER} option in {@link mLetterboxBackgroundType}.

     *

     * <p>If given value is < 0 or >= 1, both it and a value of {@link

     * com.android.internal.R.dimen.config_letterboxBackgroundWallaperDarkScrimAlpha} are ignored

     * and 0.0 (transparent) is instead.

     */

    void setLetterboxBackgroundWallpaperDarkScrimAlpha(float alpha) {

        mLetterboxBackgroundWallpaperDarkScrimAlpha = alpha;

    }



    /**

     * Resets alpha of a black scrim shown over wallpaper letterbox background to {@link

     * com.android.internal.R.dimen.config_letterboxBackgroundWallaperDarkScrimAlpha}.

     */

    void resetLetterboxBackgroundWallpaperDarkScrimAlpha() {

        mLetterboxBackgroundWallpaperDarkScrimAlpha = mContext.getResources().getFloat(

                com.android.internal.R.dimen.config_letterboxBackgroundWallaperDarkScrimAlpha);

    }



    /**

     * Gets alpha of a black scrim shown over wallpaper letterbox background.

     */
@@ -263,28 +184,6 @@ final class LetterboxConfiguration { 
        return mLetterboxBackgroundWallpaperDarkScrimAlpha;

    }



    /**

     * Overrides blur radius for {@link #LETTERBOX_BACKGROUND_WALLPAPER} option in

     * {@link mLetterboxBackgroundType}.

     *

     * <p> If given value <= 0, both it and a value of {@link

     * com.android.internal.R.dimen.config_letterboxBackgroundWallpaperBlurRadius} are ignored

     * and 0 is used instead.

     */

    void setLetterboxBackgroundWallpaperBlurRadius(int radius) {

        mLetterboxBackgroundWallpaperBlurRadius = radius;

    }



    /**

     * Resets blur raidus for {@link #LETTERBOX_BACKGROUND_WALLPAPER} option in {@link

     * mLetterboxBackgroundType} to {@link

     * com.android.internal.R.dimen.config_letterboxBackgroundWallpaperBlurRadius}.

     */

    void resetLetterboxBackgroundWallpaperBlurRadius() {

        mLetterboxBackgroundWallpaperBlurRadius = mContext.getResources().getDimensionPixelSize(

                com.android.internal.R.dimen.config_letterboxBackgroundWallpaperBlurRadius);

    }



    /**

     * Gets blur raidus for {@link #LETTERBOX_BACKGROUND_WALLPAPER} option in {@link

     * mLetterboxBackgroundType}.
@@ -312,17 +211,9 @@ final class LetterboxConfiguration { 
     * com.android.internal.R.dimen.config_letterboxHorizontalPositionMultiplier} are ignored and

     * central position (0.5) is used.

     */

    @VisibleForTesting

    void setLetterboxHorizontalPositionMultiplier(float multiplier) {

        mLetterboxHorizontalPositionMultiplier = multiplier;

    }



    /**

     * Resets horizontal position of a center of the letterboxed app window to {@link

     * com.android.internal.R.dimen.config_letterboxHorizontalPositionMultiplier}.

     */

    void resetLetterboxHorizontalPositionMultiplier() {

        mLetterboxHorizontalPositionMultiplier = mContext.getResources().getFloat(

                com.android.internal.R.dimen.config_letterboxHorizontalPositionMultiplier);

    }



}

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

+0 −19
Original line number Diff line number Diff line
@@ -5391,25 +5391,6 @@ public class WindowManagerService extends IWindowManager.Stub 
        }

    }



    void setSandboxDisplayApis(int displayId, boolean sandboxDisplayApis) {

        if (mContext.checkCallingOrSelfPermission(WRITE_SECURE_SETTINGS)

                != PackageManager.PERMISSION_GRANTED) {

            throw new SecurityException("Must hold permission " + WRITE_SECURE_SETTINGS);

        }



        final long ident = Binder.clearCallingIdentity();

        try {

            synchronized (mGlobalLock) {

                final DisplayContent displayContent = mRoot.getDisplayContent(displayId);

                if (displayContent != null) {

                    displayContent.setSandboxDisplayApis(sandboxDisplayApis);

                }

            }

        } finally {

            Binder.restoreCallingIdentity(ident);

        }

    }



    /** The global settings only apply to default display. */

    private boolean applyForcedPropertiesForDefaultDisplay() {

        boolean changed = false;

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

+0 −361

File changed.

Preview size limit exceeded, changes collapsed.