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

Merge "Skip pulling UwbActivityInfo if UWB service is not available" into udc-dev am: 44d77dadbd

Browse Source 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/23422560

Change-Id: I304d6920d7753a7b9f6b732a0017d9cb6849c902
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Liang Li
2023-05-30 23:17:00 +00:00
committed by Automerger Merge Worker
parent 9df285e43f 44d77dadbd
commit 9141a913cc
1 changed files with 5 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
services/core/java/com/android/server/stats/pull/StatsPullAtomService.java
View File

@@ -1004,7 +1004,8 @@ public class StatsPullAtomService extends SystemService {
} }
private void initAndRegisterDeferredPullers() { private void initAndRegisterDeferredPullers() {
mUwbManager = mContext.getSystemService(UwbManager.class); mUwbManager = mContext.getPackageManager().hasSystemFeature(PackageManager.FEATURE_UWB)
? mContext.getSystemService(UwbManager.class) : null;
registerUwbActivityInfo(); registerUwbActivityInfo();
} }
@@ -2172,6 +2173,9 @@ public class StatsPullAtomService extends SystemService {
} }
private void registerUwbActivityInfo() { private void registerUwbActivityInfo() {
if (mUwbManager == null) {
return;
}
int tagId = FrameworkStatsLog.UWB_ACTIVITY_INFO; int tagId = FrameworkStatsLog.UWB_ACTIVITY_INFO;
mStatsManager.setPullAtomCallback( mStatsManager.setPullAtomCallback(
tagId, tagId,