summaryrefslogtreecommitdiffstats
path: root/src/com/android/camera
diff options
context:
space:
mode:
authorMichael W <baddaemon87@gmail.com>2018-05-25 00:00:26 +0200
committerMichael Bestas <mkbestas@lineageos.org>2019-11-09 22:15:24 +0200
commit60a285627fcce6fe2d677efde4ce924946a2ec25 (patch)
tree2da4b8173b9eb4d30e6131fd8f6a894cb9aa682d /src/com/android/camera
parente7b4d3ec56a6cdebd55882703d4b97fb9ba65809 (diff)
downloadandroid_packages_apps_Snap-60a285627fcce6fe2d677efde4ce924946a2ec25.tar.gz
android_packages_apps_Snap-60a285627fcce6fe2d677efde4ce924946a2ec25.tar.bz2
android_packages_apps_Snap-60a285627fcce6fe2d677efde4ce924946a2ec25.zip
Snap: Allow quickreader to work with secure device
* Mimic the behaviour from CameraActivity to allow using the quickreader activity with locked screen * Pass the value if mSecureCamera as SECURE_CAMERA_EXTRA flag to get knowledge if the WindowManager flags have to be modified * Also tested: Scanning an url doesn't allow bypassing the lockscreen, so it's only the reader itself which will work with a locked device Change-Id: Ia9da7b712f5e5aab32a49d272e3d42651dee412d
Diffstat (limited to 'src/com/android/camera')
-rwxr-xr-xsrc/com/android/camera/CameraActivity.java5
1 files changed, 3 insertions, 2 deletions
diff --git a/src/com/android/camera/CameraActivity.java b/src/com/android/camera/CameraActivity.java
index 5d2ae5e68..39c80bb84 100755
--- a/src/com/android/camera/CameraActivity.java
+++ b/src/com/android/camera/CameraActivity.java
@@ -2187,8 +2187,9 @@ public class CameraActivity extends Activity
@Override
public void onModuleSelected(int moduleIndex) {
if (moduleIndex == ModuleSwitcher.QR_MODULE_INDEX) {
- startActivity(new Intent(this, ScannerActivity.class));
- finish();
+ Intent intent = new Intent(this, ScannerActivity.class);
+ intent.putExtra(SECURE_CAMERA_EXTRA, mSecureCamera);
+ startActivity(intent);
return;
}