From 847b534fdfa17700c0458edc74a0331f7daccded Mon Sep 17 00:00:00 2001
From: Chen Chen <cncn@google.com>
Date: Tue, 10 Mar 2020 10:51:52 -0700
Subject: [PATCH] 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: Iad90e67a2cdde86aabb95585975be56fc33361fe
---
 .../android/settings/core/instrumentation/StatsLogWriter.java | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/com/android/settings/core/instrumentation/StatsLogWriter.java b/src/com/android/settings/core/instrumentation/StatsLogWriter.java
index bcdecf35de2..de78c33c4ea 100644
--- a/src/com/android/settings/core/instrumentation/StatsLogWriter.java
+++ b/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 */);
     }