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

Commit 82311d60 authored by weichinweng's avatar weichinweng Committed by Automerger Merge Worker
Browse files

NIAP: Add new argument to determine config checksum check result.(1/4) am: 8b707bec 

Change-Id: I55ee5c2b97951eb2a8ee7fc61833025be4aa844e
parents 7b92adea 8b707bec

android/app/jni/com_android_bluetooth_btservice_AdapterService.cpp

+5 −5
Original line number Diff line number Diff line
@@ -680,7 +680,7 @@ static void classInitNative(JNIEnv* env, jclass clazz) { 
}



static bool initNative(JNIEnv* env, jobject obj, jboolean isGuest,

                       jboolean isNiapMode) {

                       jboolean isNiapMode, int configCompareResult) {

  ALOGV("%s", __func__);



  android_bluetooth_UidTraffic.clazz =
@@ -694,9 +694,9 @@ static bool initNative(JNIEnv* env, jobject obj, jboolean isGuest, 
    return JNI_FALSE;

  }



  int ret = sBluetoothInterface->init(&sBluetoothCallbacks,

                                      isGuest == JNI_TRUE ? 1 : 0,

                                      isNiapMode == JNI_TRUE ? 1 : 0);

  int ret = sBluetoothInterface->init(

      &sBluetoothCallbacks, isGuest == JNI_TRUE ? 1 : 0,

      isNiapMode == JNI_TRUE ? 1 : 0, configCompareResult);

  if (ret != BT_STATUS_SUCCESS) {

    ALOGE("Error while setting the callbacks: %d\n", ret);

    sBluetoothInterface = NULL;
@@ -1309,7 +1309,7 @@ static int getMetricIdNative(JNIEnv* env, jobject obj, jbyteArray address) { 
static JNINativeMethod sMethods[] = {

    /* name, signature, funcPtr */

    {"classInitNative", "()V", (void*)classInitNative},

    {"initNative", "(ZZ)Z", (void*)initNative},

    {"initNative", "(ZZI)Z", (void*)initNative},

    {"cleanupNative", "()V", (void*)cleanupNative},

    {"enableNative", "()Z", (void*)enableNative},

    {"disableNative", "()Z", (void*)disableNative},

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

+4 −2
Original line number Diff line number Diff line
@@ -440,7 +440,8 @@ public class AdapterService extends Service { 
        mJniCallbacks = new JniCallbacks(this, mAdapterProperties);

        mBluetoothKeystoreService = new BluetoothKeystoreService(isNiapMode());

        mBluetoothKeystoreService.start();

        initNative(isGuest(), isNiapMode());

        int configCompareResult = mBluetoothKeystoreService.getCompareResult();

        initNative(isGuest(), isNiapMode(), configCompareResult);

        mNativeAvailable = true;

        mCallbacks = new RemoteCallbackList<IBluetoothCallback>();

        mAppOps = getSystemService(AppOpsManager.class);
@@ -3076,7 +3077,8 @@ public class AdapterService extends Service { 


    static native void classInitNative();



    native boolean initNative(boolean startRestricted, boolean isNiapMode);

    native boolean initNative(boolean startRestricted, boolean isNiapMode,

            int configCompareResult);



    native void cleanupNative();

android/app/tests/unit/src/com/android/bluetooth/btservice/AdapterServiceTest.java

+2 −1
Original line number Diff line number Diff line
@@ -107,7 +107,8 @@ public class AdapterServiceTest { 
        }

        Assert.assertNotNull(Looper.myLooper());

        AdapterService adapterService = new AdapterService();

        adapterService.initNative(false /* is_restricted */, false /* is_niap_mode */);

        adapterService.initNative(false /* is_restricted */, false /* is_niap_mode */,

                0 /* config_compare_result */);

        adapterService.cleanupNative();

        HashMap<String, HashMap<String, String>> adapterConfig = TestUtils.readAdapterConfig();

        Assert.assertNotNull(adapterConfig);

android/app/tests/unit/src/com/android/bluetooth/btservice/ProfileServiceTest.java

+2 −1
Original line number Diff line number Diff line
@@ -96,7 +96,8 @@ public class ProfileServiceTest { 


        mProfiles = Config.getSupportedProfiles();



        mMockAdapterService.initNative(false /* is_restricted */, false /* is_niap_mode */);

        mMockAdapterService.initNative(false /* is_restricted */, false /* is_niap_mode */,

                0 /* config_compare_result */);



        TestUtils.setAdapterService(mMockAdapterService);