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

Commit f40b778a authored by Kyunglyul Hyun's avatar Kyunglyul Hyun
Browse files

Use mDatabaseManager when calling database functions 

When Bluetooth is turning off, there were cases
that getConnectedPolicy() or setConnectedPolicy()
of ProfileService are called, which threw NPE as
mAdapterService is null.
This CL adds mDatabaseManager to profile services
so that they can handle those cases.

Bug: 231243228
Tag: #stability
Test: atest GoogleBluetoothInstrumentationTests &&
manually turning on/off Bluetooth
to confirm NPE is not thrown

Merged-In: I7e6006d69d0ce245f27e27002e9e6c5740e7093b
Change-Id: I7e6006d69d0ce245f27e27002e9e6c5740e7093b
(cherry picked from commit c7b7420e)
(cherry picked from commit ee511dd6)
parent fb6b13ac

android/app/src/com/android/bluetooth/bas/BatteryService.java

+6 −4
Original line number Original line Diff line number Diff line
@@ -38,6 +38,7 @@ import android.util.Log; 
import com.android.bluetooth.Utils;

import com.android.bluetooth.Utils;

import com.android.bluetooth.btservice.AdapterService;

import com.android.bluetooth.btservice.AdapterService;

import com.android.bluetooth.btservice.ProfileService;

import com.android.bluetooth.btservice.ProfileService;

import com.android.bluetooth.btservice.storage.DatabaseManager;

import com.android.internal.annotations.VisibleForTesting;

import com.android.internal.annotations.VisibleForTesting;

import com.android.modules.utils.SynchronousResultReceiver;

import com.android.modules.utils.SynchronousResultReceiver;
@@ -62,6 +63,7 @@ public class BatteryService extends ProfileService { 
    private static BatteryService sBatteryService;

    private static BatteryService sBatteryService;





    private AdapterService mAdapterService;

    private AdapterService mAdapterService;

    private DatabaseManager mDatabaseManager;

    private HandlerThread mStateMachinesThread;

    private HandlerThread mStateMachinesThread;

    private final Map<BluetoothDevice, BatteryStateMachine> mStateMachines = new HashMap<>();

    private final Map<BluetoothDevice, BatteryStateMachine> mStateMachines = new HashMap<>();
@@ -94,6 +96,8 @@ public class BatteryService extends ProfileService { 




        mAdapterService = Objects.requireNonNull(AdapterService.getAdapterService(),

        mAdapterService = Objects.requireNonNull(AdapterService.getAdapterService(),

                "AdapterService cannot be null when BatteryService starts");

                "AdapterService cannot be null when BatteryService starts");

        mDatabaseManager = Objects.requireNonNull(mAdapterService.getDatabase(),

                "DatabaseManager cannot be null when BatteryService starts");





        mStateMachines.clear();

        mStateMachines.clear();

        mStateMachinesThread = new HandlerThread("BatteryService.StateMachines");

        mStateMachinesThread = new HandlerThread("BatteryService.StateMachines");
@@ -395,8 +399,7 @@ public class BatteryService extends ProfileService { 
        if (DBG) {

        if (DBG) {

            Log.d(TAG, "Saved connectionPolicy " + device + " = " + connectionPolicy);

            Log.d(TAG, "Saved connectionPolicy " + device + " = " + connectionPolicy);

        }

        }

        mAdapterService.getDatabase()

        mDatabaseManager.setProfileConnectionPolicy(device, BluetoothProfile.BATTERY,

                .setProfileConnectionPolicy(device, BluetoothProfile.BATTERY,

                        connectionPolicy);

                        connectionPolicy);

        if (connectionPolicy == BluetoothProfile.CONNECTION_POLICY_ALLOWED) {

        if (connectionPolicy == BluetoothProfile.CONNECTION_POLICY_ALLOWED) {

            connect(device);

            connect(device);
@@ -413,8 +416,7 @@ public class BatteryService extends ProfileService { 
    public int getConnectionPolicy(BluetoothDevice device) {

    public int getConnectionPolicy(BluetoothDevice device) {

        enforceCallingOrSelfPermission(BLUETOOTH_PRIVILEGED,

        enforceCallingOrSelfPermission(BLUETOOTH_PRIVILEGED,

                "Need BLUETOOTH_PRIVILEGED permission");

                "Need BLUETOOTH_PRIVILEGED permission");

        return mAdapterService.getDatabase()

        return mDatabaseManager.getProfileConnectionPolicy(device, BluetoothProfile.BATTERY);

                .getProfileConnectionPolicy(device, BluetoothProfile.BATTERY);

    }

    }

    /**

    /**

     * Called when the battery level of the device is notified.

     * Called when the battery level of the device is notified.

android/app/src/com/android/bluetooth/bass_client/BassClientService.java

+7 −3
Original line number Original line Diff line number Diff line
@@ -17,6 +17,7 @@ 
package com.android.bluetooth.bass_client;

package com.android.bluetooth.bass_client;





import static android.Manifest.permission.BLUETOOTH_CONNECT;

import static android.Manifest.permission.BLUETOOTH_CONNECT;



import static com.android.bluetooth.Utils.enforceBluetoothPrivilegedPermission;

import static com.android.bluetooth.Utils.enforceBluetoothPrivilegedPermission;





import android.bluetooth.BluetoothAdapter;

import android.bluetooth.BluetoothAdapter;
@@ -47,6 +48,7 @@ import android.util.Log; 
import com.android.bluetooth.Utils;

import com.android.bluetooth.Utils;

import com.android.bluetooth.btservice.AdapterService;

import com.android.bluetooth.btservice.AdapterService;

import com.android.bluetooth.btservice.ProfileService;

import com.android.bluetooth.btservice.ProfileService;

import com.android.bluetooth.btservice.storage.DatabaseManager;

import com.android.internal.annotations.VisibleForTesting;

import com.android.internal.annotations.VisibleForTesting;





import java.nio.ByteBuffer;

import java.nio.ByteBuffer;
@@ -74,6 +76,7 @@ public class BassClientService extends ProfileService { 
    private HandlerThread mStateMachinesThread;

    private HandlerThread mStateMachinesThread;

    private HandlerThread mCallbackHandlerThread;

    private HandlerThread mCallbackHandlerThread;

    private AdapterService mAdapterService;

    private AdapterService mAdapterService;

    private DatabaseManager mDatabaseManager;

    private BluetoothAdapter mBluetoothAdapter = null;

    private BluetoothAdapter mBluetoothAdapter = null;

    private BassUtils mBassUtils = null;

    private BassUtils mBassUtils = null;

    private Map<BluetoothDevice, BluetoothDevice> mActiveSourceMap;

    private Map<BluetoothDevice, BluetoothDevice> mActiveSourceMap;
@@ -218,6 +221,8 @@ public class BassClientService extends ProfileService { 
        }

        }

        mAdapterService = Objects.requireNonNull(AdapterService.getAdapterService(),

        mAdapterService = Objects.requireNonNull(AdapterService.getAdapterService(),

                "AdapterService cannot be null when BassClientService starts");

                "AdapterService cannot be null when BassClientService starts");

        mDatabaseManager = Objects.requireNonNull(mAdapterService.getDatabase(),

                "DatabaseManager cannot be null when BassClientService starts");

        mBluetoothAdapter = BluetoothAdapter.getDefaultAdapter();

        mBluetoothAdapter = BluetoothAdapter.getDefaultAdapter();

        mStateMachines.clear();

        mStateMachines.clear();

        mStateMachinesThread = new HandlerThread("BassClientService.StateMachines");

        mStateMachinesThread = new HandlerThread("BassClientService.StateMachines");
@@ -545,7 +550,7 @@ public class BassClientService extends ProfileService { 
            Log.d(TAG, "Saved connectionPolicy " + device + " = " + connectionPolicy);

            Log.d(TAG, "Saved connectionPolicy " + device + " = " + connectionPolicy);

        }

        }

        boolean setSuccessfully =

        boolean setSuccessfully =

                mAdapterService.getDatabase().setProfileConnectionPolicy(device,

                mDatabaseManager.setProfileConnectionPolicy(device,

                        BluetoothProfile.LE_AUDIO_BROADCAST_ASSISTANT, connectionPolicy);

                        BluetoothProfile.LE_AUDIO_BROADCAST_ASSISTANT, connectionPolicy);

        if (setSuccessfully && connectionPolicy == BluetoothProfile.CONNECTION_POLICY_ALLOWED) {

        if (setSuccessfully && connectionPolicy == BluetoothProfile.CONNECTION_POLICY_ALLOWED) {

            connect(device);

            connect(device);
@@ -568,8 +573,7 @@ public class BassClientService extends ProfileService { 
     * @return connection policy of the device

     * @return connection policy of the device

     */

     */

    public int getConnectionPolicy(BluetoothDevice device) {

    public int getConnectionPolicy(BluetoothDevice device) {

        return mAdapterService

        return mDatabaseManager

                .getDatabase()

                .getProfileConnectionPolicy(device, BluetoothProfile.LE_AUDIO_BROADCAST_ASSISTANT);

                .getProfileConnectionPolicy(device, BluetoothProfile.LE_AUDIO_BROADCAST_ASSISTANT);

    }

    }

android/app/src/com/android/bluetooth/csip/CsipSetCoordinatorService.java

+7 −3
Original line number Original line Diff line number Diff line
@@ -47,6 +47,7 @@ import android.util.Pair; 
import com.android.bluetooth.Utils;

import com.android.bluetooth.Utils;

import com.android.bluetooth.btservice.AdapterService;

import com.android.bluetooth.btservice.AdapterService;

import com.android.bluetooth.btservice.ProfileService;

import com.android.bluetooth.btservice.ProfileService;

import com.android.bluetooth.btservice.storage.DatabaseManager;

import com.android.internal.annotations.VisibleForTesting;

import com.android.internal.annotations.VisibleForTesting;

import com.android.modules.utils.SynchronousResultReceiver;

import com.android.modules.utils.SynchronousResultReceiver;
@@ -76,6 +77,7 @@ public class CsipSetCoordinatorService extends ProfileService { 
    private static CsipSetCoordinatorService sCsipSetCoordinatorService;

    private static CsipSetCoordinatorService sCsipSetCoordinatorService;





    private AdapterService mAdapterService;

    private AdapterService mAdapterService;

    private DatabaseManager mDatabaseManager;

    private HandlerThread mStateMachinesThread;

    private HandlerThread mStateMachinesThread;

    private BluetoothDevice mPreviousAudioDevice;

    private BluetoothDevice mPreviousAudioDevice;
@@ -121,10 +123,12 @@ public class CsipSetCoordinatorService extends ProfileService { 
            throw new IllegalStateException("start() called twice");

            throw new IllegalStateException("start() called twice");

        }

        }





        // Get AdapterService, CsipSetCoordinatorNativeInterface.

        // Get AdapterService, DatabaseManager, CsipSetCoordinatorNativeInterface.

        // None of them can be null.

        // None of them can be null.

        mAdapterService = Objects.requireNonNull(AdapterService.getAdapterService(),

        mAdapterService = Objects.requireNonNull(AdapterService.getAdapterService(),

                "AdapterService cannot be null when CsipSetCoordinatorService starts");

                "AdapterService cannot be null when CsipSetCoordinatorService starts");

        mDatabaseManager = Objects.requireNonNull(mAdapterService.getDatabase(),

                "DatabaseManager cannot be null when CsipSetCoordinatorService starts");

        mCsipSetCoordinatorNativeInterface = Objects.requireNonNull(

        mCsipSetCoordinatorNativeInterface = Objects.requireNonNull(

                CsipSetCoordinatorNativeInterface.getInstance(),

                CsipSetCoordinatorNativeInterface.getInstance(),

                "CsipSetCoordinatorNativeInterface cannot be null when"

                "CsipSetCoordinatorNativeInterface cannot be null when"
@@ -461,7 +465,7 @@ public class CsipSetCoordinatorService extends ProfileService { 
        if (DBG) {

        if (DBG) {

            Log.d(TAG, "Saved connectionPolicy " + device + " = " + connectionPolicy);

            Log.d(TAG, "Saved connectionPolicy " + device + " = " + connectionPolicy);

        }

        }

        mAdapterService.getDatabase().setProfileConnectionPolicy(

        mDatabaseManager.setProfileConnectionPolicy(

                device, BluetoothProfile.CSIP_SET_COORDINATOR, connectionPolicy);

                device, BluetoothProfile.CSIP_SET_COORDINATOR, connectionPolicy);

        if (connectionPolicy == BluetoothProfile.CONNECTION_POLICY_ALLOWED) {

        if (connectionPolicy == BluetoothProfile.CONNECTION_POLICY_ALLOWED) {

            connect(device);

            connect(device);
@@ -479,7 +483,7 @@ public class CsipSetCoordinatorService extends ProfileService { 
     */

     */

    public int getConnectionPolicy(BluetoothDevice device) {

    public int getConnectionPolicy(BluetoothDevice device) {

        enforceCallingOrSelfPermission(BLUETOOTH_PRIVILEGED, "Need BLUETOOTH_PRIVILEGED permission");

        enforceCallingOrSelfPermission(BLUETOOTH_PRIVILEGED, "Need BLUETOOTH_PRIVILEGED permission");

        return mAdapterService.getDatabase().getProfileConnectionPolicy(

        return mDatabaseManager.getProfileConnectionPolicy(

                device, BluetoothProfile.CSIP_SET_COORDINATOR);

                device, BluetoothProfile.CSIP_SET_COORDINATOR);

    }

    }

android/app/src/com/android/bluetooth/hap/HapClientService.java

+7 −5
Original line number Original line Diff line number Diff line
@@ -49,6 +49,7 @@ import com.android.bluetooth.Utils; 
import com.android.bluetooth.btservice.AdapterService;

import com.android.bluetooth.btservice.AdapterService;

import com.android.bluetooth.btservice.ProfileService;

import com.android.bluetooth.btservice.ProfileService;

import com.android.bluetooth.btservice.ServiceFactory;

import com.android.bluetooth.btservice.ServiceFactory;

import com.android.bluetooth.btservice.storage.DatabaseManager;

import com.android.bluetooth.csip.CsipSetCoordinatorService;

import com.android.bluetooth.csip.CsipSetCoordinatorService;

import com.android.internal.annotations.VisibleForTesting;

import com.android.internal.annotations.VisibleForTesting;

import com.android.modules.utils.SynchronousResultReceiver;

import com.android.modules.utils.SynchronousResultReceiver;
@@ -79,6 +80,7 @@ public class HapClientService extends ProfileService { 
    @VisibleForTesting

    @VisibleForTesting

    HapClientNativeInterface mHapClientNativeInterface;

    HapClientNativeInterface mHapClientNativeInterface;

    private AdapterService mAdapterService;

    private AdapterService mAdapterService;

    private DatabaseManager mDatabaseManager;

    private HandlerThread mStateMachinesThread;

    private HandlerThread mStateMachinesThread;

    private BroadcastReceiver mBondStateChangedReceiver;

    private BroadcastReceiver mBondStateChangedReceiver;

    private BroadcastReceiver mConnectionStateChangedReceiver;

    private BroadcastReceiver mConnectionStateChangedReceiver;
@@ -151,10 +153,12 @@ public class HapClientService extends ProfileService { 
            throw new IllegalStateException("start() called twice");

            throw new IllegalStateException("start() called twice");

        }

        }





        // Get AdapterService, HapClientNativeInterface, AudioManager.

        // Get AdapterService, HapClientNativeInterface, DatabaseManager, AudioManager.

        // None of them can be null.

        // None of them can be null.

        mAdapterService = Objects.requireNonNull(AdapterService.getAdapterService(),

        mAdapterService = Objects.requireNonNull(AdapterService.getAdapterService(),

                "AdapterService cannot be null when HapClientService starts");

                "AdapterService cannot be null when HapClientService starts");

        mDatabaseManager = Objects.requireNonNull(mAdapterService.getDatabase(),

                "DatabaseManager cannot be null when HapClientService starts");

        mHapClientNativeInterface = Objects.requireNonNull(

        mHapClientNativeInterface = Objects.requireNonNull(

                HapClientNativeInterface.getInstance(),

                HapClientNativeInterface.getInstance(),

                "HapClientNativeInterface cannot be null when HapClientService starts");

                "HapClientNativeInterface cannot be null when HapClientService starts");
@@ -368,8 +372,7 @@ public class HapClientService extends ProfileService { 
        if (DBG) {

        if (DBG) {

            Log.d(TAG, "Saved connectionPolicy " + device + " = " + connectionPolicy);

            Log.d(TAG, "Saved connectionPolicy " + device + " = " + connectionPolicy);

        }

        }

        mAdapterService.getDatabase()

        mDatabaseManager.setProfileConnectionPolicy(device, BluetoothProfile.HAP_CLIENT,

                .setProfileConnectionPolicy(device, BluetoothProfile.HAP_CLIENT,

                        connectionPolicy);

                        connectionPolicy);

        if (connectionPolicy == BluetoothProfile.CONNECTION_POLICY_ALLOWED) {

        if (connectionPolicy == BluetoothProfile.CONNECTION_POLICY_ALLOWED) {

            connect(device);

            connect(device);
@@ -392,8 +395,7 @@ public class HapClientService extends ProfileService { 
     * @hide

     * @hide

     */

     */

    public int getConnectionPolicy(BluetoothDevice device) {

    public int getConnectionPolicy(BluetoothDevice device) {

        return mAdapterService.getDatabase()

        return mDatabaseManager.getProfileConnectionPolicy(device, BluetoothProfile.HAP_CLIENT);

                .getProfileConnectionPolicy(device, BluetoothProfile.HAP_CLIENT);

    }

    }





    /**

    /**

android/app/src/com/android/bluetooth/vc/VolumeControlService.java

+7 −5
Original line number Original line Diff line number Diff line
@@ -47,6 +47,7 @@ import com.android.bluetooth.Utils; 
import com.android.bluetooth.btservice.AdapterService;

import com.android.bluetooth.btservice.AdapterService;

import com.android.bluetooth.btservice.ProfileService;

import com.android.bluetooth.btservice.ProfileService;

import com.android.bluetooth.btservice.ServiceFactory;

import com.android.bluetooth.btservice.ServiceFactory;

import com.android.bluetooth.btservice.storage.DatabaseManager;

import com.android.internal.annotations.VisibleForTesting;

import com.android.internal.annotations.VisibleForTesting;

import com.android.modules.utils.SynchronousResultReceiver;

import com.android.modules.utils.SynchronousResultReceiver;
@@ -71,6 +72,7 @@ public class VolumeControlService extends ProfileService { 
    private static VolumeControlService sVolumeControlService;

    private static VolumeControlService sVolumeControlService;





    private AdapterService mAdapterService;

    private AdapterService mAdapterService;

    private DatabaseManager mDatabaseManager;

    private HandlerThread mStateMachinesThread;

    private HandlerThread mStateMachinesThread;

    private BluetoothDevice mPreviousAudioDevice;

    private BluetoothDevice mPreviousAudioDevice;
@@ -211,10 +213,12 @@ public class VolumeControlService extends ProfileService { 
            throw new IllegalStateException("start() called twice");

            throw new IllegalStateException("start() called twice");

        }

        }





        // Get AdapterService, VolumeControlNativeInterface, AudioManager.

        // Get AdapterService, VolumeControlNativeInterface, DatabaseManager, AudioManager.

        // None of them can be null.

        // None of them can be null.

        mAdapterService = Objects.requireNonNull(AdapterService.getAdapterService(),

        mAdapterService = Objects.requireNonNull(AdapterService.getAdapterService(),

                "AdapterService cannot be null when VolumeControlService starts");

                "AdapterService cannot be null when VolumeControlService starts");

        mDatabaseManager = Objects.requireNonNull(mAdapterService.getDatabase(),

                "DatabaseManager cannot be null when VolumeControlService starts");

        mVolumeControlNativeInterface = Objects.requireNonNull(

        mVolumeControlNativeInterface = Objects.requireNonNull(

                VolumeControlNativeInterface.getInstance(),

                VolumeControlNativeInterface.getInstance(),

                "VolumeControlNativeInterface cannot be null when VolumeControlService starts");

                "VolumeControlNativeInterface cannot be null when VolumeControlService starts");
@@ -532,8 +536,7 @@ public class VolumeControlService extends ProfileService { 
        if (DBG) {

        if (DBG) {

            Log.d(TAG, "Saved connectionPolicy " + device + " = " + connectionPolicy);

            Log.d(TAG, "Saved connectionPolicy " + device + " = " + connectionPolicy);

        }

        }

        mAdapterService.getDatabase()

        mDatabaseManager.setProfileConnectionPolicy(device, BluetoothProfile.VOLUME_CONTROL,

                .setProfileConnectionPolicy(device, BluetoothProfile.VOLUME_CONTROL,

                        connectionPolicy);

                        connectionPolicy);

        if (connectionPolicy == BluetoothProfile.CONNECTION_POLICY_ALLOWED) {

        if (connectionPolicy == BluetoothProfile.CONNECTION_POLICY_ALLOWED) {

            connect(device);

            connect(device);
@@ -547,8 +550,7 @@ public class VolumeControlService extends ProfileService { 
    public int getConnectionPolicy(BluetoothDevice device) {

    public int getConnectionPolicy(BluetoothDevice device) {

        enforceCallingOrSelfPermission(BLUETOOTH_PRIVILEGED,

        enforceCallingOrSelfPermission(BLUETOOTH_PRIVILEGED,

                "Need BLUETOOTH_PRIVILEGED permission");

                "Need BLUETOOTH_PRIVILEGED permission");

        return mAdapterService.getDatabase()

        return mDatabaseManager.getProfileConnectionPolicy(device, BluetoothProfile.VOLUME_CONTROL);

                .getProfileConnectionPolicy(device, BluetoothProfile.VOLUME_CONTROL);

    }

    }





    boolean isVolumeOffsetAvailable(BluetoothDevice device) {

    boolean isVolumeOffsetAvailable(BluetoothDevice device) {