Merge "Log and skip noteEvent calls with null name" into sc-dev am: 0e1ba5a342

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15419007

Change-Id: Ie4baae18cc7495ae337142c99cede75f957bfdd4

1 files changed, 6 insertions, 0 deletions

diff --git a/services/core/java/com/android/server/am/BatteryStatsService.java b/services/core/java/com/android/server/am/BatteryStatsService.java
index 9f41c8ba9626..ae14ca7b66bd 100644
--- a/services/core/java/com/android/server/am/BatteryStatsService.java
+++ b/services/core/java/com/android/server/am/BatteryStatsService.java
@@ -841,6 +841,12 @@ public final class BatteryStatsService extends IBatteryStats.Stub
 
     public void noteEvent(final int code, final String name, final int uid) {
         enforceCallingPermission();
+        if (name == null) {
+            // TODO(b/194733136): Replace with an IllegalArgumentException throw.
+            Slog.wtfStack(TAG, "noteEvent called with null name. code = " + code);
+            return;
+        }
+
         synchronized (mLock) {
             final long elapsedRealtime = SystemClock.elapsedRealtime();
             final long uptime = SystemClock.uptimeMillis();