3 files changed, 4 insertions, 4 deletions
diff --git a/src/com/android/camera/ComboPreferences.java b/src/com/android/camera/ComboPreferences.java
index 80adfbe84..42cf62423 100644
--- a/src/com/android/camera/ComboPreferences.java
+++ b/src/com/android/camera/ComboPreferences.java
@@ -330,8 +330,5 @@ public class ComboPreferences implements
             listener.onSharedPreferenceChanged(this, key);
         }
         BackupManager.dataChanged(mPackageName);
-
-        Object newValue = sharedPreferences.getAll().get(key);
-        UsageStatistics.onEvent("CameraSettingsChange", newValue.toString(), key);
     }
 }
diff --git a/src/com/android/camera/ListPreference.java b/src/com/android/camera/ListPreference.java
index 34040d79b..909b32c55 100644
--- a/src/com/android/camera/ListPreference.java
+++ b/src/com/android/camera/ListPreference.java
@@ -27,6 +27,7 @@ import android.util.Log;
 import android.util.TypedValue;
 
 import com.android.camera.util.CameraUtil;
+import com.android.camera.util.UsageStatistics;
 import com.android.camera2.R;
 
 /**
@@ -159,6 +160,7 @@ public class ListPreference extends CameraPreference {
         SharedPreferences.Editor editor = getSharedPreferences().edit();
         editor.putString(mKey, value);
         editor.apply();
+        UsageStatistics.onEvent("CameraSettingsChange", value, mKey);
     }
 
     @Override
diff --git a/src/com/android/camera/PhotoModule.java b/src/com/android/camera/PhotoModule.java
index d6b1b65ca..d2281f40b 100644
--- a/src/com/android/camera/PhotoModule.java
+++ b/src/com/android/camera/PhotoModule.java
@@ -1014,7 +1014,8 @@ public class PhotoModule
         setCameraState(SNAPSHOT_IN_PROGRESS);
         UsageStatistics.onEvent(UsageStatistics.COMPONENT_CAMERA,
                 UsageStatistics.ACTION_CAPTURE_DONE, "Photo", 0,
-                UsageStatistics.hashFileName(mNamedImages.mQueue.lastElement().title + ".jpg"));
+                UsageStatistics.hashFileName(mNamedImages.mQueue.lastElement().title + ".jpg"),
+                mParameters.flatten());
         return true;
     }