From 84fcc8963ed5f514dceb02272e5f577069d0b682 Mon Sep 17 00:00:00 2001
From: Michael Wachenschwanz <mwachens@google.com>
Date: Thu, 29 Jul 2021 11:30:37 -0700
Subject: [PATCH] Log and skip noteEvent calls with null name

Bug: 194733136
Test: builds + boots
Change-Id: I909a4656d3d3aa502466d96ffa804573de258587
---
 .../java/com/android/server/am/BatteryStatsService.java     | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/services/core/java/com/android/server/am/BatteryStatsService.java b/services/core/java/com/android/server/am/BatteryStatsService.java
index 9f41c8ba96266..ae14ca7b66bda 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();