diff options
| author | Shuzhen Wang <shuzhenwang@google.com> | 2023-10-27 16:08:05 -0700 |
|---|---|---|
| committer | Shuzhen Wang <shuzhenwang@google.com> | 2023-10-28 01:21:59 +0000 |
| commit | 3c097bb0e516b1d071f00ac99a8f29f4a72579ff (patch) | |
| tree | 34a8e6f89ba2dafb48d20631efe0c5f150af90ba | |
| parent | 1a463d744403d2cef36eeaf072aabeff46602d48 (diff) | |
| download | Camera2-3c097bb0e516b1d071f00ac99a8f29f4a72579ff.tar.gz | |
Camera2: Do not pass location info for startActivity case
If the Camera2 activity is started by startActivity, we shouldn't
unconditionally grant location.
Test: Use Camera2 app both independently and with INTENT
Bug: 285142084
Change-Id: I3b78840f9b0fefeadea44150ea319886f06c1485
| -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 18d87bf24..7881853c1 100644 --- a/src/com/android/camera/CameraActivity.java +++ b/src/com/android/camera/CameraActivity.java @@ -1738,8 +1738,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 { |