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

Commit f635699e authored by weichinweng's avatar weichinweng Committed by Weichin Weng
Browse files

NIAP: Implement BluetoothKeystore feature 

Bug: 148758680
Test: atest BluetoothKeystoreServiceTest
Change-Id: I19ec7b4ece5183c3d401844a089a287a37d324c5
Merged-In: I19ec7b4ece5183c3d401844a089a287a37d324c5
parent a61ec7e0

src/com/android/bluetooth/btservice/AdapterService.java

+13 −0
Original line number Diff line number Diff line
@@ -83,6 +83,7 @@ import com.android.bluetooth.Utils; 
import com.android.bluetooth.a2dp.A2dpService;

import com.android.bluetooth.a2dpsink.A2dpSinkService;

import com.android.bluetooth.btservice.RemoteDevices.DeviceProperties;

import com.android.bluetooth.btservice.bluetoothkeystore.BluetoothKeystoreService;

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

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

import com.android.bluetooth.gatt.GattService;
@@ -226,6 +227,7 @@ public class AdapterService extends Service { 


    private BluetoothSocketManagerBinder mBluetoothSocketManagerBinder;



    private BluetoothKeystoreService mBluetoothKeystoreService;

    private A2dpService mA2dpService;

    private A2dpSinkService mA2dpSinkService;

    private HeadsetService mHeadsetService;
@@ -436,6 +438,8 @@ public class AdapterService extends Service { 
        mAdapterProperties = new AdapterProperties(this);

        mAdapterStateMachine = AdapterState.make(this);

        mJniCallbacks = new JniCallbacks(this, mAdapterProperties);

        mBluetoothKeystoreService = new BluetoothKeystoreService(isNiapMode());

        mBluetoothKeystoreService.start();

        initNative(isGuest(), isNiapMode());

        mNativeAvailable = true;

        mCallbacks = new RemoteCallbackList<IBluetoothCallback>();
@@ -745,6 +749,10 @@ public class AdapterService extends Service { 
            mSdpManager = null;

        }



        if (mBluetoothKeystoreService != null) {

            mBluetoothKeystoreService.cleanup();

        }



        if (mNativeAvailable) {

            debugLog("cleanup() - Cleaning up adapter native");

            cleanupNative();
@@ -1903,6 +1911,11 @@ public class AdapterService extends Service { 
            if (service.mDatabaseManager != null) {

                service.mDatabaseManager.factoryReset();

            }



            if (service.mBluetoothKeystoreService != null) {

                service.mBluetoothKeystoreService.factoryReset();

            }



            return service.factoryResetNative();

        }