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

Commit b9fd32e5 authored by Treehugger Robot's avatar Treehugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Cleanup enable_camera_compat_for_desktop_windowing_opt_out." into main

parents 305bfcd0 cafe47ab

core/api/current.txt

+1 −1
Original line number Diff line number Diff line
@@ -56453,7 +56453,7 @@ package android.view { 
    field public static final String PROPERTY_ACTIVITY_EMBEDDING_SPLITS_ENABLED = "android.window.PROPERTY_ACTIVITY_EMBEDDING_SPLITS_ENABLED";

    field public static final String PROPERTY_CAMERA_COMPAT_ALLOW_FORCE_ROTATION = "android.window.PROPERTY_CAMERA_COMPAT_ALLOW_FORCE_ROTATION";

    field public static final String PROPERTY_CAMERA_COMPAT_ALLOW_REFRESH = "android.window.PROPERTY_CAMERA_COMPAT_ALLOW_REFRESH";

    field @FlaggedApi("com.android.window.flags.enable_camera_compat_for_desktop_windowing_opt_out_api") public static final String PROPERTY_CAMERA_COMPAT_ALLOW_SIMULATE_REQUESTED_ORIENTATION = "android.window.PROPERTY_CAMERA_COMPAT_ALLOW_SIMULATE_REQUESTED_ORIENTATION";

    field public static final String PROPERTY_CAMERA_COMPAT_ALLOW_SIMULATE_REQUESTED_ORIENTATION = "android.window.PROPERTY_CAMERA_COMPAT_ALLOW_SIMULATE_REQUESTED_ORIENTATION";

    field public static final String PROPERTY_CAMERA_COMPAT_ENABLE_REFRESH_VIA_PAUSE = "android.window.PROPERTY_CAMERA_COMPAT_ENABLE_REFRESH_VIA_PAUSE";

    field public static final String PROPERTY_COMPAT_ALLOW_DISPLAY_ORIENTATION_OVERRIDE = "android.window.PROPERTY_COMPAT_ALLOW_DISPLAY_ORIENTATION_OVERRIDE";

    field @FlaggedApi("com.android.window.flags.app_compat_properties_api") public static final String PROPERTY_COMPAT_ALLOW_IGNORING_ORIENTATION_REQUEST_WHEN_LOOP_DETECTED = "android.window.PROPERTY_COMPAT_ALLOW_IGNORING_ORIENTATION_REQUEST_WHEN_LOOP_DETECTED";

core/api/test-current.txt

+1 −1
Original line number Diff line number Diff line
@@ -1131,7 +1131,7 @@ package android.content.pm { 
    field public static final long NEVER_SANDBOX_DISPLAY_APIS = 184838306L; // 0xb0468a2L

    field public static final long OVERRIDE_CAMERA_COMPAT_DISABLE_FORCE_ROTATION = 263959004L; // 0xfbbb1dcL

    field public static final long OVERRIDE_CAMERA_COMPAT_DISABLE_REFRESH = 264304459L; // 0xfc0f74bL

    field @FlaggedApi("com.android.window.flags.enable_camera_compat_for_desktop_windowing_opt_out_api") public static final long OVERRIDE_CAMERA_COMPAT_DISABLE_SIMULATE_REQUESTED_ORIENTATION = 398195815L; // 0x17bbfc67L

    field public static final long OVERRIDE_CAMERA_COMPAT_DISABLE_SIMULATE_REQUESTED_ORIENTATION = 398195815L; // 0x17bbfc67L

    field public static final long OVERRIDE_CAMERA_COMPAT_ENABLE_REFRESH_VIA_PAUSE = 264301586L; // 0xfc0ec12L

    field public static final long OVERRIDE_ENABLE_COMPAT_FAKE_FOCUS = 263259275L; // 0xfb1048bL

    field @FlaggedApi("com.android.window.flags.app_compat_properties_api") public static final long OVERRIDE_ENABLE_COMPAT_IGNORE_ORIENTATION_REQUEST_WHEN_LOOP_DETECTED = 273509367L; // 0x104d6bf7L

core/java/android/content/pm/ActivityInfo.java

+0 −1
Original line number Diff line number Diff line
@@ -1374,7 +1374,6 @@ public class ActivityInfo extends ComponentInfo implements Parcelable { 
    @Overridable

    @Disabled

    @TestApi

    @FlaggedApi(Flags.FLAG_ENABLE_CAMERA_COMPAT_FOR_DESKTOP_WINDOWING_OPT_OUT_API)

    public static final long OVERRIDE_CAMERA_COMPAT_DISABLE_SIMULATE_REQUESTED_ORIENTATION =

            398195815L;  // buganizer id

core/java/android/view/WindowManager.java

+0 −1
Original line number Diff line number Diff line
@@ -1168,7 +1168,6 @@ public interface WindowManager extends ViewManager { 
     * </pre>

     *

     */

    @FlaggedApi(Flags.FLAG_ENABLE_CAMERA_COMPAT_FOR_DESKTOP_WINDOWING_OPT_OUT_API)

    String PROPERTY_CAMERA_COMPAT_ALLOW_SIMULATE_REQUESTED_ORIENTATION =

            "android.window.PROPERTY_CAMERA_COMPAT_ALLOW_SIMULATE_REQUESTED_ORIENTATION";

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

+8 −18
Original line number Diff line number Diff line
@@ -19,7 +19,6 @@ package com.android.server.wm; 
import static android.content.pm.ActivityInfo.OVERRIDE_CAMERA_COMPAT_DISABLE_FORCE_ROTATION;

import static android.content.pm.ActivityInfo.OVERRIDE_CAMERA_COMPAT_DISABLE_REFRESH;

import static android.content.pm.ActivityInfo.OVERRIDE_CAMERA_COMPAT_DISABLE_SIMULATE_REQUESTED_ORIENTATION;

import static android.content.pm.ActivityInfo.OVERRIDE_CAMERA_COMPAT_ENABLE_FREEFORM_WINDOWING_TREATMENT;

import static android.content.pm.ActivityInfo.OVERRIDE_CAMERA_COMPAT_ENABLE_REFRESH_VIA_PAUSE;

import static android.content.pm.ActivityInfo.OVERRIDE_MIN_ASPECT_RATIO_ONLY_FOR_CAMERA;

import static android.content.pm.ActivityInfo.OVERRIDE_ORIENTATION_ONLY_FOR_CAMERA;
@@ -38,12 +37,10 @@ import static com.android.server.wm.ActivityTaskManagerDebugConfig.TAG_WITH_CLAS 
import static com.android.server.wm.AppCompatUtils.isChangeEnabled;



import android.annotation.NonNull;

import android.annotation.Nullable;

import android.util.proto.ProtoOutputStream;

import android.window.DesktopModeFlags;



import com.android.server.wm.utils.OptPropFactory;

import com.android.window.flags.Flags;



import java.util.function.BooleanSupplier;
@@ -69,7 +66,7 @@ class AppCompatCameraOverrides { 
    private final OptPropFactory.OptProp mCameraCompatEnableRefreshViaPauseOptProp;

    @NonNull

    private final OptPropFactory.OptProp mCameraCompatAllowForceRotationOptProp;

    @Nullable

    @NonNull

    private final OptPropFactory.OptProp mCameraCompatAllowOrientationTreatmentOptProp;



    AppCompatCameraOverrides(@NonNull ActivityRecord activityRecord,
@@ -97,10 +94,9 @@ class AppCompatCameraOverrides { 
        mCameraCompatAllowForceRotationOptProp = optPropBuilder.create(

                PROPERTY_CAMERA_COMPAT_ALLOW_FORCE_ROTATION,

                isCameraCompatForceRotateTreatmentEnabled);

        mCameraCompatAllowOrientationTreatmentOptProp =

                Flags.enableCameraCompatForDesktopWindowingOptOut() ? optPropBuilder.create(

        mCameraCompatAllowOrientationTreatmentOptProp = optPropBuilder.create(

                PROPERTY_CAMERA_COMPAT_ALLOW_SIMULATE_REQUESTED_ORIENTATION,

                        isCameraCompatSimulateRequestedOrientationTreatmentEnabled) : null;

                isCameraCompatSimulateRequestedOrientationTreatmentEnabled);

    }



    /**
@@ -195,17 +191,11 @@ class AppCompatCameraOverrides { 
    }



    private boolean shouldEnableCameraCompatSimulateRequestedOrientationTreatmentForApp() {

        if (mCameraCompatAllowOrientationTreatmentOptProp != null) {

            // OptProp is not-null iff the opt-out flag is on.

        return mAppCompatConfiguration

                .isCameraCompatSimulateRequestedOrientationTreatmentEnabled()

                && mCameraCompatAllowOrientationTreatmentOptProp

                        .shouldEnableWithOptOutOverrideAndProperty(isChangeEnabled(mActivityRecord,

                                OVERRIDE_CAMERA_COMPAT_DISABLE_SIMULATE_REQUESTED_ORIENTATION));

        } else {

            return isChangeEnabled(mActivityRecord,

                    OVERRIDE_CAMERA_COMPAT_ENABLE_FREEFORM_WINDOWING_TREATMENT);

        }

    }



    /**