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

Commit 261247f6 authored by Austin Borger's avatar Austin Borger Committed by Android (Google) Code Review
Browse files

Merge "DO NOT MERGE CameraManager: Enable override to portrait by default for... 

Merge "DO NOT MERGE CameraManager: Enable override to portrait by default for devices with the system property turned on." into tm-qpr-dev
parents 1cd9826a fccc2cb6

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

+2 −2
Original line number Diff line number Diff line
@@ -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;