Merge tag 'android-security-10.0.0_r48' into staging/lineage-17.1_merge-android-security-10.0.0_r48
Android security 10.0.0 release 48 * tag 'refs/tags/android-security-10.0.0_r48': 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 Conflicts: jni/com_android_bluetooth_btservice_AdapterService.cpp src/com/android/bluetooth/btservice/AdapterService.java tests/unit/src/com/android/bluetooth/btservice/AdapterServiceTest.java tests/unit/src/com/android/bluetooth/btservice/ProfileServiceTest.java Change-Id: I821a3723229fda2c1281a28b4aa3a0f9a7ea2866
Loading
Please register or sign in to comment