From 5cfd1276c1fac448381094c5753ecd411b9212f3 Mon Sep 17 00:00:00 2001 From: someone5678 Date: Mon, 19 Dec 2022 23:24:08 +0900 Subject: [PATCH] [TMP] Settings: Bluetooth: Don't check persistable uri permission for BtHelper Change-Id: I392c70e04bdc64dba7f897cae2b124b195049af5 (cherry picked from commit f1074d6226820ec095abce89b7a387409e69d513) --- .../bluetooth/AdvancedBluetoothDetailsHeaderController.java | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/com/android/settings/bluetooth/AdvancedBluetoothDetailsHeaderController.java b/src/com/android/settings/bluetooth/AdvancedBluetoothDetailsHeaderController.java index 4a7de237521..cd049e81b67 100644 --- a/src/com/android/settings/bluetooth/AdvancedBluetoothDetailsHeaderController.java +++ b/src/com/android/settings/bluetooth/AdvancedBluetoothDetailsHeaderController.java @@ -729,8 +729,10 @@ public class AdvancedBluetoothDetailsHeaderController extends BasePreferenceCont ThreadUtils.postOnBackgroundThread(() -> { final Uri uri = Uri.parse(iconUri); try { - mContext.getContentResolver().takePersistableUriPermission(uri, - Intent.FLAG_GRANT_READ_URI_PERMISSION); + if (!uri.toString().startsWith("android.resource://com.android.bluetooth.bthelper/drawable")) { + mContext.getContentResolver().takePersistableUriPermission(uri, + Intent.FLAG_GRANT_READ_URI_PERMISSION); + } final Bitmap bitmap = MediaStore.Images.Media.getBitmap( mContext.getContentResolver(), uri);