diff options
| author | Shuzhen Wang <shuzhenwang@google.com> | 2023-11-01 05:28:29 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2023-11-01 05:28:29 +0000 |
| commit | ef7197d83618427bafcfe4b0d8ec6364abd71c03 (patch) | |
| tree | 302b6122c52e92c64fbc4a1b6f7a19053e925af0 | |
| parent | b9945044810f574c4bf7b5fbb5b30d19ff4c2579 (diff) | |
| parent | 3179e34244f5bdafbdb5384a993c74d75995b3a7 (diff) | |
| download | Camera2-ef7197d83618427bafcfe4b0d8ec6364abd71c03.tar.gz | |
Camera2: Do not pass location info for startActivity case am: 3c097bb0e5 am: a73f9d3e0d am: e43bba16fc am: ba5dd7a1af am: f451da03d5 am: c4cd166386 am: d58eeff54f am: a0abba23df am: 3179e34244
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Camera2/+/25135945
Change-Id: Idaf1e23598938cff721fd806ce49b07d48fb9c40
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
| -rw-r--r-- | src/com/android/camera/CameraActivity.java | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/src/com/android/camera/CameraActivity.java b/src/com/android/camera/CameraActivity.java index e1e80d2d9..3093b2584 100644 --- a/src/com/android/camera/CameraActivity.java +++ b/src/com/android/camera/CameraActivity.java @@ -1705,8 +1705,12 @@ public class CameraActivity extends QuickActivity private boolean shouldUseNoOpLocation () { String callingPackage = getCallingPackage(); if (callingPackage == null) { - // Activity not started through startActivityForResult. - return false; + if (isCaptureIntent()) { + // Activity not started through startActivityForResult. + return true; + } else { + callingPackage = mAppContext.getPackageName(); + } } PackageInfo packageInfo = null; try { |