Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 6cd2cb06 authored by Liang Li's avatar Liang Li Committed by Automerger Merge Worker
Browse files

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

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



Change-Id: I597be9122bd0cf82525d5155438b5d0ef494fcf3
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents bea7f7f9 44d77dad

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,