diff options
| author | Puneet Lall <puneetl@google.com> | 2014-10-08 00:47:36 +0000 |
|---|---|---|
| committer | Puneet Lall <puneetl@google.com> | 2014-10-08 00:47:45 +0000 |
| commit | 0d4cdba26b5fe4b7ca03796c5a2644a09e2c7144 (patch) | |
| tree | 4526a063fe1ab410678ad63bfd94a050afff27f5 /src/com/android/camera/util/QuickActivity.java | |
| parent | fe7eb1640b1aca8500b2cab152648a699833d6fd (diff) | |
| download | android_packages_apps_Camera2-0d4cdba26b5fe4b7ca03796c5a2644a09e2c7144.tar.gz android_packages_apps_Camera2-0d4cdba26b5fe4b7ca03796c5a2644a09e2c7144.tar.bz2 android_packages_apps_Camera2-0d4cdba26b5fe4b7ca03796c5a2644a09e2c7144.zip | |
Revert "More lockscreen tuning"
This reverts commit 7ac13f5f3644c8de53ebd625f195d757166bf9c9.
Change-Id: I3c59f4d71efe80290731e55421011c16e5dd4a41
Diffstat (limited to 'src/com/android/camera/util/QuickActivity.java')
| -rw-r--r-- | src/com/android/camera/util/QuickActivity.java | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/src/com/android/camera/util/QuickActivity.java b/src/com/android/camera/util/QuickActivity.java index 2416de4b0..965b541ec 100644 --- a/src/com/android/camera/util/QuickActivity.java +++ b/src/com/android/camera/util/QuickActivity.java @@ -177,7 +177,10 @@ public abstract class QuickActivity extends Activity { } private boolean delayOnResumeOnStart() { - return true; + String action = getIntent().getAction(); + boolean isSecureLockscreenCamera = + action.equals(MediaStore.INTENT_ACTION_STILL_IMAGE_CAMERA_SECURE); + return isSecureLockscreenCamera; } /** |