summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Austin Borger <borgera@google.com> 2022-12-12 11:25:24 -0800
committer Austin Borger <borgera@google.com> 2022-12-13 00:45:49 +0000
commitfccc2cb660132f8ee01eeb17d803cf93f4bd6afb (patch)
tree9e9635dfaa672487f8a347b203ead61ce35cb8d3
parent55d73f2ed480fcf75a7437ecc93d19cc941f335c (diff)
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
-rw-r--r--core/java/android/hardware/camera2/CameraManager.java4
1 files 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;