Skip to content

Android 16 QPR3 BluetoothSocket constructor #481

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
yhtez wants to merge 1 commit into
base: android/testing
Choose a base branch
from
+14 −4
Draft

Android 16 QPR3 BluetoothSocket constructor #481

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 7 additions & 2 deletions android/app/src/main/java/me/kavishdevar/librepods/services/AirPodsService.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,7 @@ import android.app.NotificationManager
import android.app.PendingIntent
import android.app.Service
import android.appwidget.AppWidgetManager
import android.bluetooth.BluetoothAdapter
import android.bluetooth.BluetoothDevice
import android.bluetooth.BluetoothHeadset
import android.bluetooth.BluetoothManager
Expand Down Expand Up @@ -2353,8 +2354,12 @@ class AirPodsService : Service(), SharedPreferences.OnSharedPreferenceChangeList
}

private fun createBluetoothSocket(device: BluetoothDevice, uuid: ParcelUuid): BluetoothSocket {
val type = 3 // L2CAP
val type = BluetoothSocket.TYPE_L2CAP
val adapter = HiddenApiBypass.getInstanceFields(device.javaClass)
.firstOrNull { it.name == "mAdapter" }
?.run { isAccessible = true; get(device) as BluetoothAdapter }
val constructorSpecs = listOf(
arrayOf(adapter, device, type, true, true, 0x1001, uuid),
arrayOf(device, type, true, true, 0x1001, uuid),
arrayOf(device, type, 1, true, true, 0x1001, uuid),
arrayOf(type, 1, true, true, device, 0x1001, uuid),
Expand Down Expand Up @@ -2392,7 +2397,7 @@ class AirPodsService : Service(), SharedPreferences.OnSharedPreferenceChangeList
@SuppressLint("MissingPermission", "UnspecifiedRegisterReceiverFlag")
fun connectToSocket(device: BluetoothDevice, manual: Boolean = false) {
Log.d(TAG, "<LogCollector:Start> Connecting to socket")
HiddenApiBypass.addHiddenApiExemptions("Landroid/bluetooth/BluetoothSocket;")
HiddenApiBypass.addHiddenApiExemptions("Landroid/bluetooth/BluetoothSocket;", "Landroid/bluetooth/BluetoothDevice;")
val uuid: ParcelUuid = ParcelUuid.fromString("74ec2172-0bad-4d01-8f77-997b2be0722a")
if (!isConnectedLocally) {
socket = try {
Expand Down
9 changes: 7 additions & 2 deletions android/app/src/main/java/me/kavishdevar/librepods/utils/ATTManager.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@
package me.kavishdevar.librepods.utils

import android.annotation.SuppressLint
import android.bluetooth.BluetoothAdapter
import android.bluetooth.BluetoothDevice
import android.bluetooth.BluetoothSocket
import android.os.ParcelUuid
Expand Down Expand Up @@ -69,7 +70,7 @@ class ATTManager(private val device: BluetoothDevice) {

@SuppressLint("MissingPermission")
fun connect() {
HiddenApiBypass.addHiddenApiExemptions("Landroid/bluetooth/BluetoothSocket;")
HiddenApiBypass.addHiddenApiExemptions("Landroid/bluetooth/BluetoothSocket;", "Landroid/bluetooth/BluetoothDevice;")
val uuid = ParcelUuid.fromString("00000000-0000-0000-0000-000000000000")

socket = createBluetoothSocket(device, uuid)
Expand Down Expand Up @@ -196,8 +197,12 @@ class ATTManager(private val device: BluetoothDevice) {
}

private fun createBluetoothSocket(device: BluetoothDevice, uuid: ParcelUuid): BluetoothSocket {
val type = 3 // L2CAP
val type = BluetoothSocket.TYPE_L2CAP
val adapter = HiddenApiBypass.getInstanceFields(device.javaClass)
.firstOrNull { it.name == "mAdapter" }
?.run { isAccessible = true; get(device) as BluetoothAdapter }
val constructorSpecs = listOf(
arrayOf(adapter, device, type, true, true, 31, uuid),
arrayOf(device, type, true, true, 31, uuid),
arrayOf(device, type, 1, true, true, 31, uuid),
arrayOf(type, 1, true, true, device, 31, uuid),
Expand Down