Merge "MetricId: Avoid byte[] and string ambiguity" am: 291ff22d7b

Change-Id: I749ba8ae504f37a7a3e9f2c7aa09ebcca8245964

src/com/android/settings/core/instrumentation/StatsLogWriter.java

@@ -31,7 +31,7 @@ public class StatsLogWriter implements LogWriter {
                 attribution,
                 SettingsEnums.PAGE_VISIBLE /* action */,
                 pageId,
-                null /* changedPreferenceKey */,
+                "" /* changedPreferenceKey */,
                 0 /* changedPreferenceIntValue */);
     }
 
@@ -41,7 +41,7 @@ public class StatsLogWriter implements LogWriter {
                 SettingsEnums.PAGE_UNKNOWN /* attribution */,
                 SettingsEnums.PAGE_HIDE /* action */,
                 pageId,
-                null /* changedPreferenceKey */,
+                "" /* changedPreferenceKey */,
                 0 /* changedPreferenceIntValue */);
     }