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

Commit dc7a46bb authored by William Escande's avatar William Escande
Browse files

SystemServer: initialize new listener separatly 

Bug: 310000873
Test: atest BluetoothManagerServiceTest
Change-Id: Ib823568ab1d0ab18d3d07b6129a84931ba66e797
parent 7d8dff7d

service/src/com/android/server/bluetooth/BluetoothManagerService.java

+14 −6
Original line number Diff line number Diff line
@@ -1484,13 +1484,13 @@ class BluetoothManagerService { 
        mHandler.post(() -> internalHandleOnBootPhase(userHandle));

    }



    private void internalHandleOnBootPhase(UserHandle userHandle) {

        if (DBG) {

            Log.d(TAG, "Bluetooth boot completed");

        }



    @VisibleForTesting

    void initialize(UserHandle userHandle) {

        if (mUseNewAirplaneMode) {

            mCurrentUserContext = mContext.createContextAsUser(userHandle, 0);

            mCurrentUserContext =

                    requireNonNull(

                            mContext.createContextAsUser(userHandle, 0),

                            "Current User Context cannot be null");

            AirplaneModeListener.initialize(

                    mLooper,

                    mContentResolver,
@@ -1506,6 +1506,14 @@ class BluetoothManagerService { 
            SatelliteModeListener.initialize(

                    mLooper, mContentResolver, this::onSatelliteModeChanged);

        }

    }



    private void internalHandleOnBootPhase(UserHandle userHandle) {

        if (DBG) {

            Log.d(TAG, "Bluetooth boot completed");

        }



        initialize(userHandle);



        final boolean isBluetoothDisallowed = isBluetoothDisallowed();

        if (isBluetoothDisallowed) {

service/tests/src/com/android/server/bluetooth/BluetoothManagerServiceTest.java

+3 −0
Original line number Diff line number Diff line
@@ -88,6 +88,7 @@ public class BluetoothManagerServiceTest { 


    @Spy BluetoothServerProxy mBluetoothServerProxy;

    @Mock UserManager mUserManager;

    @Mock UserHandle mUserHandle;



    @Mock IBinder mBinder;

    @Mock IBluetoothManagerCallback mManagerCallback;
@@ -153,6 +154,8 @@ public class BluetoothManagerServiceTest { 


        mManagerService =

                new BluetoothManagerService(mContext, mLooper.getLooper(), mFakeFlagsImpl);

        mManagerService.initialize(mUserHandle);



        mManagerService.registerAdapter(mManagerCallback);

    }