commit 24344d50016a66b9fe6eb8273a69852436d9c687
author Chen Chen <cncn@google.com> Mon Mar 09 18:17:18 2020 -0700
committer Chen Chen <cncn@google.com> Tue Mar 10 01:56:04 2020 +0000
tree 0a55d49d3fcccbe31fa50a531162f1cd7c7b855c
parent 7eada07c97b29de62bf3b2a308366b8b6606aeb7

MetricId: Avoid byte[] and string ambiguity

Passing null to the function will result in conflict with Bluetooth proto
(int int int byte[] int)
Bug: 122571213
Test: Build

Change-Id: I2d1c3896d5d850a81a987aded14e3f0c05558e8c

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

diff --git a/src/com/android/settings/core/instrumentation/StatsLogWriter.java b/src/com/android/settings/core/instrumentation/StatsLogWriter.java
index aa5a60e..14e5d21 100644
--- a/src/com/android/settings/core/instrumentation/StatsLogWriter.java
+++ b/src/com/android/settings/core/instrumentation/StatsLogWriter.java
@@ -30,7 +30,7 @@
                 attribution, /* from pageId */
                 SettingsEnums.PAGE_VISIBLE /* action */,
                 pageId, /* target pageId */
-                null /* changedPreferenceKey */,
+                "" /* changedPreferenceKey */,
                 latency /* changedPreferenceIntValue */);
     }
 
@@ -40,7 +40,7 @@
                 SettingsEnums.PAGE_UNKNOWN /* attribution */,
                 SettingsEnums.PAGE_HIDE /* action */,
                 pageId,
-                null /* changedPreferenceKey */,
+                "" /* changedPreferenceKey */,
                 visibleTime /* changedPreferenceIntValue */);
     }