diff options
| author | Sascha Haeberling <haeberling@google.com> | 2014-10-15 18:16:14 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2014-10-15 18:16:14 +0000 |
| commit | 20a5930f5e7de203e8a8cbb2f19e87cf0a57d592 (patch) | |
| tree | e9493a8e568583f59979632e15c031582d1850f5 /src | |
| parent | 4a1fd9976fc47a732058e764c00a36f538ca430c (diff) | |
| parent | 47008b2595452102ff8389b84e44509f0389bef5 (diff) | |
| download | android_packages_apps_Camera2-20a5930f5e7de203e8a8cbb2f19e87cf0a57d592.tar.gz android_packages_apps_Camera2-20a5930f5e7de203e8a8cbb2f19e87cf0a57d592.tar.bz2 android_packages_apps_Camera2-20a5930f5e7de203e8a8cbb2f19e87cf0a57d592.zip | |
Merge "Make string comparison robust against null values." into ub-camera-glacier
Diffstat (limited to 'src')
| -rw-r--r-- | src/com/android/camera/util/QuickActivity.java | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/com/android/camera/util/QuickActivity.java b/src/com/android/camera/util/QuickActivity.java index 965b541ec..039d8fc9b 100644 --- a/src/com/android/camera/util/QuickActivity.java +++ b/src/com/android/camera/util/QuickActivity.java @@ -179,7 +179,7 @@ public abstract class QuickActivity extends Activity { private boolean delayOnResumeOnStart() { String action = getIntent().getAction(); boolean isSecureLockscreenCamera = - action.equals(MediaStore.INTENT_ACTION_STILL_IMAGE_CAMERA_SECURE); + MediaStore.INTENT_ACTION_STILL_IMAGE_CAMERA_SECURE.equals(action); return isSecureLockscreenCamera; } |