Merge "fix NPE in action switch" into ub-camera-glacier

60c02b43 · Alan Newberger · Android (Google) Code Review · c7ab9c4a · ea7db650 · 60c02b43
Commit 60c02b43 authored 10 years ago by Alan Newberger Committed by Android (Google) Code Review 10 years ago
Hide whitespace changes
Inline Side-by-side

Showing with 32 additions and 28 deletions

src/com/android/camera/CameraActivity.java src/com/android/camera/CameraActivity.java +32 -28

No files found.
--- a/src/com/android/camera/CameraActivity.java
+++ b/src/com/android/camera/CameraActivity.java
@@ -1663,34 +1663,38 @@ public class CameraActivity extends Activity
        // lockscreen onResume->onPause->onResume sequence.
        int source;
        String action = getIntent().getAction();
-        switch (action) {
-            case MediaStore.ACTION_IMAGE_CAPTURE:
-                source = ForegroundSource.ACTION_IMAGE_CAPTURE;
-                break;
-            case MediaStore.INTENT_ACTION_STILL_IMAGE_CAMERA:
-                // was UNKNOWN_SOURCE in Fishlake.
-                source = ForegroundSource.ACTION_STILL_IMAGE_CAMERA;
-                break;
-            case MediaStore.INTENT_ACTION_VIDEO_CAMERA:
-                // was UNKNOWN_SOURCE in Fishlake.
-                source = ForegroundSource.ACTION_VIDEO_CAMERA;
-                break;
-            case MediaStore.ACTION_VIDEO_CAPTURE:
-                source = ForegroundSource.ACTION_VIDEO_CAPTURE;
-                break;
-            case MediaStore.INTENT_ACTION_STILL_IMAGE_CAMERA_SECURE:
-                // was ACTION_IMAGE_CAPTURE_SECURE in Fishlake.
-                source = ForegroundSource.ACTION_STILL_IMAGE_CAMERA_SECURE;
-                break;
-            case MediaStore.ACTION_IMAGE_CAPTURE_SECURE:
-                source = ForegroundSource.ACTION_IMAGE_CAPTURE_SECURE;
-                break;
-            case Intent.ACTION_MAIN:
-                source = ForegroundSource.ACTION_MAIN;
-                break;
-            default:
-                source = ForegroundSource.UNKNOWN_SOURCE;
-                break;
+        if (action == null) {
+            source = ForegroundSource.UNKNOWN_SOURCE;
+        } else {
+            switch (action) {
+                case MediaStore.ACTION_IMAGE_CAPTURE:
+                    source = ForegroundSource.ACTION_IMAGE_CAPTURE;
+                    break;
+                case MediaStore.INTENT_ACTION_STILL_IMAGE_CAMERA:
+                    // was UNKNOWN_SOURCE in Fishlake.
+                    source = ForegroundSource.ACTION_STILL_IMAGE_CAMERA;
+                    break;
+                case MediaStore.INTENT_ACTION_VIDEO_CAMERA:
+                    // was UNKNOWN_SOURCE in Fishlake.
+                    source = ForegroundSource.ACTION_VIDEO_CAMERA;
+                    break;
+                case MediaStore.ACTION_VIDEO_CAPTURE:
+                    source = ForegroundSource.ACTION_VIDEO_CAPTURE;
+                    break;
+                case MediaStore.INTENT_ACTION_STILL_IMAGE_CAMERA_SECURE:
+                    // was ACTION_IMAGE_CAPTURE_SECURE in Fishlake.
+                    source = ForegroundSource.ACTION_STILL_IMAGE_CAMERA_SECURE;
+                    break;
+                case MediaStore.ACTION_IMAGE_CAPTURE_SECURE:
+                    source = ForegroundSource.ACTION_IMAGE_CAPTURE_SECURE;
+                    break;
+                case Intent.ACTION_MAIN:
+                    source = ForegroundSource.ACTION_MAIN;
+                    break;
+                default:
+                    source = ForegroundSource.UNKNOWN_SOURCE;
+                    break;
+            }
        }
        UsageStatistics.instance().foregrounded(source, currentUserInterfaceMode());