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

Commit 9849056d authored by Michael Bestas's avatar Michael Bestas
Browse files

Merge tag 'android-11.0.0_r17' into staging/lineage-18.0_merge-android-11.0.0_r17 

Android 11.0.0 release 17

* tag 'android-11.0.0_r17':
  Pass whether the local device is an atv device to the native layer to determine whether to include pairing dialogs for justworks and encryption only LE pairing
  Revert "Pass whether the local device is an atv device to the na..."
  Pass whether the local device is an atv device to the native layer to determine whether to include pairing dialogs for justworks and encryption only LE pairing
  SAP: Ensure pending intent is immutable

Change-Id: Icea0adb36fcee6de091237d790cec00edde51cc1
parents cdc3c78d 45a2fb5c

jni/com_android_bluetooth_btservice_AdapterService.cpp

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



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

                       jboolean isNiapMode, int configCompareResult) {

                       jboolean isNiapMode, int configCompareResult,

                       jboolean isAtvDevice) {

  ALOGV("%s", __func__);



  android_bluetooth_UidTraffic.clazz =
@@ -696,7 +697,8 @@ static bool initNative(JNIEnv* env, jobject obj, jboolean isGuest, 


  int ret = sBluetoothInterface->init(

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

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

      isNiapMode == JNI_TRUE ? 1 : 0, configCompareResult,

      isAtvDevice == JNI_TRUE ? 1 : 0);

  if (ret != BT_STATUS_SUCCESS) {

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

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

    /* name, signature, funcPtr */

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

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

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

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

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

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

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

+6 −2
Original line number Diff line number Diff line
@@ -441,7 +441,11 @@ public class AdapterService extends Service { 
        mBluetoothKeystoreService = new BluetoothKeystoreService(isNiapMode());

        mBluetoothKeystoreService.start();

        int configCompareResult = mBluetoothKeystoreService.getCompareResult();

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



        // Android TV doesn't show consent dialogs for just works and encryption only le pairing

        boolean isAtvDevice = getApplicationContext().getPackageManager().hasSystemFeature(

                PackageManager.FEATURE_LEANBACK_ONLY);

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

        mNativeAvailable = true;

        mCallbacks = new RemoteCallbackList<IBluetoothCallback>();

        mAppOps = getSystemService(AppOpsManager.class);
@@ -3080,7 +3084,7 @@ public class AdapterService extends Service { 
    static native void classInitNative();



    native boolean initNative(boolean startRestricted, boolean isNiapMode,

            int configCompareResult);

            int configCompareResult, boolean isAtvDevice);



    native void cleanupNative();

src/com/android/bluetooth/sap/SapServer.java

+1 −0
Original line number Diff line number Diff line
@@ -226,6 +226,7 @@ public class SapServer extends Thread implements Callback { 
                mContext.getString(R.string.bluetooth_sap_notif_title),

                NotificationManager.IMPORTANCE_HIGH);

        notificationManager.createNotificationChannel(notificationChannel);

        flags |= PendingIntent.FLAG_IMMUTABLE;

        if (VERBOSE) {

            Log.i(TAG, "setNotification type: " + type);

        }

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

+1 −1
Original line number Diff line number Diff line
@@ -108,7 +108,7 @@ public class AdapterServiceTest { 
        Assert.assertNotNull(Looper.myLooper());

        AdapterService adapterService = new AdapterService();

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

                0 /* config_compare_result */);

                0 /* config_compare_result */, false);

        adapterService.cleanupNative();

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

        Assert.assertNotNull(adapterConfig);

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

+1 −1
Original line number Diff line number Diff line
@@ -97,7 +97,7 @@ public class ProfileServiceTest { 
        mProfiles = Config.getSupportedProfiles();



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

                0 /* config_compare_result */);

                0 /* config_compare_result */, false);



        TestUtils.setAdapterService(mMockAdapterService);