diff options
| author | 2024-07-28 20:20:06 +0000 | |
|---|---|---|
| committer | 2024-07-28 20:20:06 +0000 | |
| commit | 92ab503ddf08a0755a93b07c8183ff91c99fea6f (patch) | |
| tree | 59c1577fe842d75563fed8ec1e9dd790ac0a30df | |
| parent | 5eb18ea6cf2dcf5084693bbd785fccc20f607eeb (diff) | |
| parent | 6c3977886a9e9f4b34f2e9a962bf445b286aad96 (diff) | |
Merge "Fix NPE in SensorPowerStatsProcessor" into main
| -rw-r--r-- | services/core/java/com/android/server/power/stats/SensorPowerStatsProcessor.java | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/services/core/java/com/android/server/power/stats/SensorPowerStatsProcessor.java b/services/core/java/com/android/server/power/stats/SensorPowerStatsProcessor.java index 7b815d91b325..5bd32882c1b1 100644 --- a/services/core/java/com/android/server/power/stats/SensorPowerStatsProcessor.java +++ b/services/core/java/com/android/server/power/stats/SensorPowerStatsProcessor.java @@ -151,7 +151,8 @@ public class SensorPowerStatsProcessor extends PowerStatsProcessor { return; } - if (item.eventTag == null || !item.eventTag.string.startsWith(SENSOR_EVENT_TAG_PREFIX)) { + if (item.eventTag == null || item.eventTag.string == null + || !item.eventTag.string.startsWith(SENSOR_EVENT_TAG_PREFIX)) { return; } |