summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Michal Brzezinski <brzezinski@google.com> 2025-03-11 16:50:11 +0000
committer Michal Brzezinski <brzezinski@google.com> 2025-03-11 16:54:06 +0000
commit02fc176117aab4a0db42f79ac3b5ad8f7cfb350e (patch)
tree5dd5e958055f89f2ca7ed9fa779b26753d4cd22d
parent95c0236c2dbf88bc8529ba35bd5822fb9e3d8d25 (diff)
NPE fix: log sensor timestamp only when sensor is not empty
I tried writing test for it but the problem is making `Trace.isTagEnabled` return true. And anyway this is easy fix so hopefully test is just nice to have. Test: manual Fixes: 401728609 Flag: EXEMPT trivial fix Change-Id: Ib4f8b962d05aff9eaaf23fc865bf53e30a4231ba
-rw-r--r--services/foldables/devicestateprovider/src/com/android/server/policy/FoldableDeviceStateProvider.java3
1 files changed, 2 insertions, 1 deletions
diff --git a/services/foldables/devicestateprovider/src/com/android/server/policy/FoldableDeviceStateProvider.java b/services/foldables/devicestateprovider/src/com/android/server/policy/FoldableDeviceStateProvider.java
index de78271acddc..69e856de401a 100644
--- a/services/foldables/devicestateprovider/src/com/android/server/policy/FoldableDeviceStateProvider.java
+++ b/services/foldables/devicestateprovider/src/com/android/server/policy/FoldableDeviceStateProvider.java
@@ -325,7 +325,8 @@ public final class FoldableDeviceStateProvider implements DeviceStateProvider,
}
if (newState != INVALID_DEVICE_STATE_IDENTIFIER && newState != mLastReportedState) {
- if (Trace.isTagEnabled(TRACE_TAG_SYSTEM_SERVER)) {
+ if (mLastHingeAngleSensorEvent != null
+ && Trace.isTagEnabled(TRACE_TAG_SYSTEM_SERVER)) {
Trace.instant(TRACE_TAG_SYSTEM_SERVER,
"[Device state changed] Last hinge sensor event timestamp: "
+ mLastHingeAngleSensorEvent.timestamp);