Merge "MetricId: Avoid byte[] and string ambiguity" into rvc-dev am: b65866968e am: 84098ef1fc

Change-Id: I64748c07ef3dbd2cdaa81169e781fca20ee08112
2020-03-10 08:04:12 +00:00
parent cf2f610479 84098ef1fc
commit e1d122c3a0
1 changed files with 2 additions and 2 deletions
--- a/src/com/android/settings/core/instrumentation/StatsLogWriter.java
+++ b/src/com/android/settings/core/instrumentation/StatsLogWriter.java
@@ -30,7 +30,7 @@ public class StatsLogWriter implements LogWriter {
                attribution, /* from pageId */
                SettingsEnums.PAGE_VISIBLE /* action */,
                pageId, /* target pageId */
-                null /* changedPreferenceKey */,
+                "" /* changedPreferenceKey */,
                latency /* changedPreferenceIntValue */);
    }

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