| commit | 3d1b8b9a3f4932b2647feab621cbd932f332b1d1 | [log] [tgz] |
|---|---|---|
| author | Austin Borger <borgera@google.com> | Fri Mar 10 02:20:43 2023 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Fri Mar 10 02:20:43 2023 +0000 |
| tree | 56c501bf10cfbea24829655d713bc0dc3598cd2b | |
| parent | c85a70a2912d288177facd4670d2821e6128e334 [diff] | |
| parent | 996fbec1b7a0cf426fe7085add506669f8ad4b4a [diff] |
Merge "CameraManager: Swap propertyName / packageName in call to getProperty()" into tm-qpr-dev am: f580918fe5 am: 996fbec1b7 Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/21944836 Change-Id: I4ddd563fb3bca8d6ea75c8c0b973e77a94dee5e0 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
diff --git a/core/java/android/hardware/camera2/CameraManager.java b/core/java/android/hardware/camera2/CameraManager.java index fbc0184..6cd4a2e 100644 --- a/core/java/android/hardware/camera2/CameraManager.java +++ b/core/java/android/hardware/camera2/CameraManager.java
@@ -1189,8 +1189,8 @@ PackageManager packageManager = context.getPackageManager(); try { - return packageManager.getProperty(context.getOpPackageName(), - PROPERTY_COMPAT_OVERRIDE_LANDSCAPE_TO_PORTRAIT).getBoolean(); + return packageManager.getProperty(PROPERTY_COMPAT_OVERRIDE_LANDSCAPE_TO_PORTRAIT, + context.getOpPackageName()).getBoolean(); } catch (PackageManager.NameNotFoundException e) { // No such property }