diff options
| author | Andy Huibers <andyhuibers@google.com> | 2014-07-31 11:10:24 -0700 |
|---|---|---|
| committer | Andy Huibers <andyhuibers@google.com> | 2014-07-31 11:10:24 -0700 |
| commit | 9a9a1086c10ea39ae9a2a5bdeeb600c2d7f940b6 (patch) | |
| tree | 819afeef73f15cede83e39bce27fe5270c108133 /src/com/android/camera/CameraActivity.java | |
| parent | 00d8bbc97d970db9604474210554caa18935c7eb (diff) | |
| download | android_packages_apps_Camera2-9a9a1086c10ea39ae9a2a5bdeeb600c2d7f940b6.tar.gz android_packages_apps_Camera2-9a9a1086c10ea39ae9a2a5bdeeb600c2d7f940b6.tar.bz2 android_packages_apps_Camera2-9a9a1086c10ea39ae9a2a5bdeeb600c2d7f940b6.zip | |
Improved logging of foreground source type.
Change-Id: I6fdd5a52ec136f76352e006a8e95e88aac0ac1af
Diffstat (limited to 'src/com/android/camera/CameraActivity.java')
| -rw-r--r-- | src/com/android/camera/CameraActivity.java | 45 |
1 files changed, 31 insertions, 14 deletions
diff --git a/src/com/android/camera/CameraActivity.java b/src/com/android/camera/CameraActivity.java index 8f16a8e88..10d45bf5f 100644 --- a/src/com/android/camera/CameraActivity.java +++ b/src/com/android/camera/CameraActivity.java @@ -1652,22 +1652,39 @@ public class CameraActivity extends Activity mAutoRotateScreen = true; } - // Foreground event logging. + // Foreground event logging. ACTION_STILL_IMAGE_CAMERA and + // INTENT_ACTION_STILL_IMAGE_CAMERA_SECURE are double logged due to + // lockscreen onResume->onPause->onResume sequence. int source; String action = getIntent().getAction(); - if (MediaStore.ACTION_VIDEO_CAPTURE.equals(action)) { - source = ForegroundSource.ACTION_VIDEO_CAPTURE; - } else if (MediaStore.ACTION_IMAGE_CAPTURE.equals(action)) { - source = ForegroundSource.ACTION_IMAGE_CAPTURE; - } else if (MediaStore.ACTION_IMAGE_CAPTURE_SECURE.equals(action) || - INTENT_ACTION_STILL_IMAGE_CAMERA_SECURE.equals(action)) { - // Foreground event caused by lock screen startup. - // May get double logged due to lock screen onResume->onPause->onResume sequence. - source = ForegroundSource.ACTION_IMAGE_CAPTURE_SECURE; - } else if (Intent.ACTION_MAIN.equals(action)) { - source = ForegroundSource.ACTION_MAIN; - } else { - source = ForegroundSource.UNKNOWN_SOURCE; + 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()); |