From ad728ecd5dd8181a6d721412dee0424f41adfb47 Mon Sep 17 00:00:00 2001 From: Evan Chen Date: Mon, 4 Mar 2024 18:08:38 +0000 Subject: Fix npe in onStart() Make sure calling loadAssociationsFromDisk() after the AssociationRevokeProcessor is initiated. Test: cts Fix: 328017524 Change-Id: I7a6e7387e5e8712f93e1c8df19e8741c541a1b2f Merged-In: I7a6e7387e5e8712f93e1c8df19e8741c541a1b2f (cherry picked from commit fccca4611726278909e31f4dd11e4e1b2a7b888b) --- .../server/companion/CompanionDeviceManagerService.java | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/services/companion/java/com/android/server/companion/CompanionDeviceManagerService.java b/services/companion/java/com/android/server/companion/CompanionDeviceManagerService.java index a478a3d84161..17ba0730c8e4 100644 --- a/services/companion/java/com/android/server/companion/CompanionDeviceManagerService.java +++ b/services/companion/java/com/android/server/companion/CompanionDeviceManagerService.java @@ -228,8 +228,6 @@ public class CompanionDeviceManagerService extends SystemService { /* cdmService */ this, mAssociationStore, mPersistentStore, mSystemDataTransferRequestStore, mAssociationRequestsProcessor); - loadAssociationsFromDisk(); - mObservableUuidStore.getObservableUuidsForUser(getContext().getUserId()); mAssociationStore.registerListener(mAssociationStoreChangeListener); @@ -240,13 +238,18 @@ public class CompanionDeviceManagerService extends SystemService { mCompanionAppController = new CompanionApplicationController( context, mAssociationStore, mObservableUuidStore, mDevicePresenceMonitor, mPowerManagerInternal); + + mAssociationRevokeProcessor = new AssociationRevokeProcessor(this, mAssociationStore, + mPackageManagerInternal, mDevicePresenceMonitor, mCompanionAppController, + mSystemDataTransferRequestStore); + + loadAssociationsFromDisk(); + mTransportManager = new CompanionTransportManager(context, mAssociationStore); mSystemDataTransferProcessor = new SystemDataTransferProcessor(this, mPackageManagerInternal, mAssociationStore, mSystemDataTransferRequestStore, mTransportManager); - mAssociationRevokeProcessor = new AssociationRevokeProcessor(this, mAssociationStore, - mPackageManagerInternal, mDevicePresenceMonitor, mCompanionAppController, - mSystemDataTransferRequestStore); + // TODO(b/279663946): move context sync to a dedicated system service mCrossDeviceSyncController = new CrossDeviceSyncController(getContext(), mTransportManager); -- cgit v1.2.3-59-g8ed1b