| commit | d58eeff54fd3a42ae1ed49b3983fb94dbfec2331 | [log] [tgz] |
|---|---|---|
| author | Shuzhen Wang <[email protected]> | Wed Nov 01 02:05:42 2023 +0000 |
| committer | Automerger Merge Worker <[email protected]> | Wed Nov 01 02:05:42 2023 +0000 |
| tree | 042a1484342bfedcf4a0951d90e06b9b0ad9df6c | |
| parent | 683bdac642bc8e7322c71aede4c8880301f8da86 [diff] | |
| parent | c4cd166386ecc925dbc97e3f47eae2f5d92d2cb2 [diff] |
Camera2: Do not pass location info for startActivity case am: 3c097bb0e5 am: a73f9d3e0d am: e43bba16fc am: ba5dd7a1af am: f451da03d5 am: c4cd166386 Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Camera2/+/25135945 Change-Id: I408605267a070cd5a925c38c40dbbd4387a98f1d Signed-off-by: Automerger Merge Worker <[email protected]>
diff --git a/src/com/android/camera/CameraActivity.java b/src/com/android/camera/CameraActivity.java index 82b0953..701d86d 100644 --- a/src/com/android/camera/CameraActivity.java +++ b/src/com/android/camera/CameraActivity.java
@@ -1735,8 +1735,12 @@ 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 {