Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Michael Wachenschwanz
2021-07-29 21:50:46 +00:00
committed by Android (Google) Code Review
parent 98a4967908 84fcc8963e
commit 0e1ba5a342
1 changed files with 6 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
services/core/java/com/android/server/am/BatteryStatsService.java
View File

@@ -841,6 +841,12 @@ public final class BatteryStatsService extends IBatteryStats.Stub
public void noteEvent(final int code, final String name, final int uid) { public void noteEvent(final int code, final String name, final int uid) {
enforceCallingPermission(); 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) { synchronized (mLock) {
final long elapsedRealtime = SystemClock.elapsedRealtime(); final long elapsedRealtime = SystemClock.elapsedRealtime();
final long uptime = SystemClock.uptimeMillis(); final long uptime = SystemClock.uptimeMillis();