Merge "Skip pulling UwbActivityInfo if UWB service is not available" into udc-dev (44d77dad) · Commits · e / os / android_frameworks_base

services/core/java/com/android/server/stats/pull/StatsPullAtomService.java

+5 −1

Original line number	Diff line number	Diff line
		@@ -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,