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

Commit 32a121ca authored by Austin Borger's avatar Austin Borger Committed by Automerger Merge Worker
Browse files

Merge "CameraManager: Swap propertyName / packageName in call to... 

Merge "CameraManager: Swap propertyName / packageName in call to getProperty()" into tm-qpr-dev am: f580918f am: 996fbec1 am: 3d1b8b9a

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/21944836



Change-Id: Ib6bb6021146ee75245ce2238bbdc69817935ddcb
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 649d29f6 3d1b8b9a

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

+2 −2
Original line number Original line Diff line number Diff line
@@ -1189,8 +1189,8 @@ public final class CameraManager { 
            PackageManager packageManager = context.getPackageManager();

            PackageManager packageManager = context.getPackageManager();





            try {

            try {

                return packageManager.getProperty(context.getOpPackageName(),

                return packageManager.getProperty(PROPERTY_COMPAT_OVERRIDE_LANDSCAPE_TO_PORTRAIT,

                            PROPERTY_COMPAT_OVERRIDE_LANDSCAPE_TO_PORTRAIT).getBoolean();

                        context.getOpPackageName()).getBoolean();

            } catch (PackageManager.NameNotFoundException e) {

            } catch (PackageManager.NameNotFoundException e) {

                // No such property

                // No such property

            }

            }