From 4046eac506e84d06a7d75c944728a1d520178787 Mon Sep 17 00:00:00 2001 From: rca Date: Wed, 29 Jan 2025 16:10:54 +0900 Subject: [PATCH] fix permission check --- .../main/java/com/example/childguard/MainActivity.java | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/app/src/main/java/com/example/childguard/MainActivity.java b/app/src/main/java/com/example/childguard/MainActivity.java index 57e8466..4cefe9d 100644 --- a/app/src/main/java/com/example/childguard/MainActivity.java +++ b/app/src/main/java/com/example/childguard/MainActivity.java @@ -292,8 +292,8 @@ public class MainActivity extends AppCompatActivity { intentFilter.addAction(BluetoothDevice.ACTION_ACL_CONNECTED); intentFilter.addAction(BluetoothDevice.ACTION_ACL_DISCONNECTED); - if (ActivityCompat.checkSelfPermission(this, Manifest.permission.BLUETOOTH_CONNECT) - != PackageManager.PERMISSION_GRANTED) { + String btPermission = getBluetoothConnectPermission(); + if (ActivityCompat.checkSelfPermission(this, btPermission) != PackageManager.PERMISSION_GRANTED) { Log.d("BT", "No permission to connect bluetooth devices"); return; } else { @@ -310,8 +310,8 @@ public class MainActivity extends AppCompatActivity { String action = intent.getAction(); BluetoothDevice device = intent.getParcelableExtra(BluetoothDevice.EXTRA_DEVICE); boolean isInCar = pref.getBoolean("isInCarPref", false); - if (ActivityCompat.checkSelfPermission(context, Manifest.permission.BLUETOOTH_CONNECT) - != PackageManager.PERMISSION_GRANTED) { + String btPermission = getBluetoothConnectPermission(); + if (ActivityCompat.checkSelfPermission(context, btPermission) != PackageManager.PERMISSION_GRANTED) { Log.d("BT", "No permission to connect bluetooth devices"); return; }