Merge "Log and skip noteEvent calls with null name" into sc-dev

2021-07-29 21:50:46 +00:00
parent 98a4967908 84fcc8963e
commit 0e1ba5a342
1 changed files with 6 additions and 0 deletions
--- 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();