From fccc2cb660132f8ee01eeb17d803cf93f4bd6afb Mon Sep 17 00:00:00 2001 From: Austin Borger Date: Mon, 12 Dec 2022 11:25:24 -0800 Subject: DO NOT MERGE CameraManager: Enable override to portrait by default for devices with the system property turned on. Bug: 250678880 Test: Checked app behavior on affected device. Change-Id: If3dcd001f9f393c2fd153aadda116302456df10b --- core/java/android/hardware/camera2/CameraManager.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/core/java/android/hardware/camera2/CameraManager.java b/core/java/android/hardware/camera2/CameraManager.java index 7fed2200d606..30b7d250f828 100644 --- a/core/java/android/hardware/camera2/CameraManager.java +++ b/core/java/android/hardware/camera2/CameraManager.java @@ -25,7 +25,7 @@ import android.annotation.SystemService; import android.annotation.TestApi; import android.app.compat.CompatChanges; import android.compat.annotation.ChangeId; -import android.compat.annotation.Disabled; +import android.compat.annotation.EnabledSince; import android.compat.annotation.Overridable; import android.content.Context; import android.content.pm.PackageManager; @@ -114,7 +114,7 @@ public final class CameraManager { */ @ChangeId @Overridable - @Disabled + @EnabledSince(targetSdkVersion = android.os.Build.VERSION_CODES.TIRAMISU) @TestApi public static final long OVERRIDE_FRONT_CAMERA_APP_COMPAT = 250678880L; -- cgit v1.2.3-59-g8ed1b