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

Commit 2115135c authored by Evan Chen's avatar Evan Chen Committed by Android (Google) Code Review
Browse files

Merge "Fix npe in onStart()" into main

parents ed6f98ac fccca461

services/companion/java/com/android/server/companion/CompanionDeviceManagerService.java

+8 −5
Original line number Diff line number Diff line
@@ -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);