From 08e8c93d35901e5f9a65ebf39820311a6ad48db7 Mon Sep 17 00:00:00 2001
From: Liang Li <lianglli@google.com>
Date: Wed, 24 May 2023 11:18:15 -0700
Subject: [PATCH] Skip pulling UwbActivityInfo if UWB service is not available

Bug: 284400250
Test: statsd_testdrive 10188
Change-Id: I55aa6694f9babe764442212039e53dea849d1a82
---
 .../com/android/server/stats/pull/StatsPullAtomService.java | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/services/core/java/com/android/server/stats/pull/StatsPullAtomService.java b/services/core/java/com/android/server/stats/pull/StatsPullAtomService.java
index e82521584731a..9128974fa9d3d 100644
--- a/services/core/java/com/android/server/stats/pull/StatsPullAtomService.java
+++ b/services/core/java/com/android/server/stats/pull/StatsPullAtomService.java
@@ -1004,7 +1004,8 @@ public class StatsPullAtomService extends SystemService {
     }
 
     private void initAndRegisterDeferredPullers() {
-        mUwbManager = mContext.getSystemService(UwbManager.class);
+        mUwbManager = mContext.getPackageManager().hasSystemFeature(PackageManager.FEATURE_UWB)
+            ? mContext.getSystemService(UwbManager.class) : null;
 
         registerUwbActivityInfo();
     }
@@ -2172,6 +2173,9 @@ public class StatsPullAtomService extends SystemService {
     }
 
     private void registerUwbActivityInfo() {
+        if (mUwbManager == null) {
+            return;
+        }
         int tagId = FrameworkStatsLog.UWB_ACTIVITY_INFO;
         mStatsManager.setPullAtomCallback(
                 tagId,