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

Commit 6d79476a authored by Mina Granic's avatar Mina Granic Committed by Android (Google) Code Review
Browse files

Merge "Use DesktopWindowing flag for Camera Compat for Freeform." into main

parents a3fe6d99 5320c7c8

core/api/test-current.txt

+4 −4
Original line number Diff line number Diff line
@@ -1614,15 +1614,15 @@ package android.hardware.camera2 { 
  public final class CameraManager {

    method @NonNull public android.hardware.camera2.CameraCharacteristics getCameraCharacteristics(@NonNull String, boolean) throws android.hardware.camera2.CameraAccessException;

    method public String[] getCameraIdListNoLazy() throws android.hardware.camera2.CameraAccessException;

    method @FlaggedApi("com.android.window.flags.camera_compat_for_freeform") public static int getRotationOverrideInternal(@Nullable android.content.Context, @Nullable android.content.pm.PackageManager, @Nullable String);

    method @FlaggedApi("com.android.window.flags.enable_camera_compat_for_desktop_windowing") public static int getRotationOverrideInternal(@Nullable android.content.Context, @Nullable android.content.pm.PackageManager, @Nullable String);

    method @RequiresPermission(android.Manifest.permission.CAMERA) public void openCamera(@NonNull String, boolean, @Nullable android.os.Handler, @NonNull android.hardware.camera2.CameraDevice.StateCallback) throws android.hardware.camera2.CameraAccessException;

    method @RequiresPermission(allOf={android.Manifest.permission.SYSTEM_CAMERA, android.Manifest.permission.CAMERA}) public void openCamera(@NonNull String, int, @NonNull java.util.concurrent.Executor, @NonNull android.hardware.camera2.CameraDevice.StateCallback) throws android.hardware.camera2.CameraAccessException;

    method public static boolean shouldOverrideToPortrait(@Nullable android.content.pm.PackageManager, @Nullable String);

    field public static final String LANDSCAPE_TO_PORTRAIT_PROP = "camera.enable_landscape_to_portrait";

    field public static final long OVERRIDE_CAMERA_LANDSCAPE_TO_PORTRAIT = 250678880L; // 0xef10e60L

    field @FlaggedApi("com.android.window.flags.camera_compat_for_freeform") public static final int ROTATION_OVERRIDE_NONE = 0; // 0x0

    field @FlaggedApi("com.android.window.flags.camera_compat_for_freeform") public static final int ROTATION_OVERRIDE_OVERRIDE_TO_PORTRAIT = 1; // 0x1

    field @FlaggedApi("com.android.window.flags.camera_compat_for_freeform") public static final int ROTATION_OVERRIDE_ROTATION_ONLY = 2; // 0x2

    field @FlaggedApi("com.android.window.flags.enable_camera_compat_for_desktop_windowing") public static final int ROTATION_OVERRIDE_NONE = 0; // 0x0

    field @FlaggedApi("com.android.window.flags.enable_camera_compat_for_desktop_windowing") public static final int ROTATION_OVERRIDE_OVERRIDE_TO_PORTRAIT = 1; // 0x1

    field @FlaggedApi("com.android.window.flags.enable_camera_compat_for_desktop_windowing") public static final int ROTATION_OVERRIDE_ROTATION_ONLY = 2; // 0x2

  }



  public abstract static class CameraManager.AvailabilityCallback {

core/java/android/hardware/camera2/CameraManager.java

+5 −5
Original line number Diff line number Diff line
@@ -181,7 +181,7 @@ public final class CameraManager { 
     * @hide

     */

    @TestApi

    @FlaggedApi(com.android.window.flags.Flags.FLAG_CAMERA_COMPAT_FOR_FREEFORM)

    @FlaggedApi(com.android.window.flags.Flags.FLAG_ENABLE_CAMERA_COMPAT_FOR_DESKTOP_WINDOWING)

    public static final int ROTATION_OVERRIDE_NONE = ICameraService.ROTATION_OVERRIDE_NONE;



    /**
@@ -191,7 +191,7 @@ public final class CameraManager { 
     * @hide

     */

    @TestApi

    @FlaggedApi(com.android.window.flags.Flags.FLAG_CAMERA_COMPAT_FOR_FREEFORM)

    @FlaggedApi(com.android.window.flags.Flags.FLAG_ENABLE_CAMERA_COMPAT_FOR_DESKTOP_WINDOWING)

    public static final int ROTATION_OVERRIDE_OVERRIDE_TO_PORTRAIT =

            ICameraService.ROTATION_OVERRIDE_OVERRIDE_TO_PORTRAIT;
@@ -201,7 +201,7 @@ public final class CameraManager { 
     * @hide

     */

    @TestApi

    @FlaggedApi(com.android.window.flags.Flags.FLAG_CAMERA_COMPAT_FOR_FREEFORM)

    @FlaggedApi(com.android.window.flags.Flags.FLAG_ENABLE_CAMERA_COMPAT_FOR_DESKTOP_WINDOWING)

    public static final int ROTATION_OVERRIDE_ROTATION_ONLY =

            ICameraService.ROTATION_OVERRIDE_ROTATION_ONLY;
@@ -1562,7 +1562,7 @@ public final class CameraManager { 
     */

    public static int getRotationOverride(@Nullable Context context,

            @Nullable PackageManager packageManager, @Nullable String packageName) {

        if (com.android.window.flags.Flags.cameraCompatForFreeform()) {

        if (com.android.window.flags.Flags.enableCameraCompatForDesktopWindowing()) {

            return getRotationOverrideInternal(context, packageManager, packageName);

        } else {

            return shouldOverrideToPortrait(packageManager, packageName)
@@ -1574,7 +1574,7 @@ public final class CameraManager { 
    /**

     * @hide

     */

    @FlaggedApi(com.android.window.flags.Flags.FLAG_CAMERA_COMPAT_FOR_FREEFORM)

    @FlaggedApi(com.android.window.flags.Flags.FLAG_ENABLE_CAMERA_COMPAT_FOR_DESKTOP_WINDOWING)

    @TestApi

    public static int getRotationOverrideInternal(@Nullable Context context,

            @Nullable PackageManager packageManager, @Nullable String packageName) {

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

+1 −1
Original line number Diff line number Diff line
@@ -170,7 +170,7 @@ class AppCompatCameraOverrides { 
     * </ul>

     */

    boolean shouldApplyFreeformTreatmentForCameraCompat() {

        return Flags.cameraCompatForFreeform() && !isChangeEnabled(mActivityRecord,

        return Flags.enableCameraCompatForDesktopWindowing() && !isChangeEnabled(mActivityRecord,

                OVERRIDE_CAMERA_COMPAT_DISABLE_FREEFORM_WINDOWING_TREATMENT);

    }

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

+3 −2
Original line number Diff line number Diff line
@@ -48,7 +48,8 @@ class AppCompatCameraPolicy { 
        // without the need to restart the device.

        final boolean needsDisplayRotationCompatPolicy =

                wmService.mAppCompatConfiguration.isCameraCompatTreatmentEnabledAtBuildTime();

        final boolean needsCameraCompatFreeformPolicy = Flags.cameraCompatForFreeform()

        final boolean needsCameraCompatFreeformPolicy =

                Flags.enableCameraCompatForDesktopWindowing()

                        && DesktopModeHelper.canEnterDesktopMode(wmService.mContext);

        if (needsDisplayRotationCompatPolicy || needsCameraCompatFreeformPolicy) {

            mCameraStateMonitor = new CameraStateMonitor(displayContent, wmService.mH);

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

+1 −1
Original line number Diff line number Diff line
@@ -124,7 +124,7 @@ final class CameraCompatFreeformPolicy implements CameraStateMonitor.CameraCompa 
     */

    @VisibleForTesting

    boolean shouldApplyFreeformTreatmentForCameraCompat(@NonNull ActivityRecord activity) {

        return Flags.cameraCompatForFreeform() && !activity.info.isChangeEnabled(

        return Flags.enableCameraCompatForDesktopWindowing() && !activity.info.isChangeEnabled(

                ActivityInfo.OVERRIDE_CAMERA_COMPAT_DISABLE_FREEFORM_WINDOWING_TREATMENT);

    }