commit afe918573bddb9bf4c657fd86a2fdaeb4526f9d7
author Ömer Faruk Yılmaz <ofy@google.com> Wed Apr 05 01:14:10 2023 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Wed Apr 05 01:14:10 2023 +0000
tree f41e26eda1b3ad031f3051ffab2e2ff549cf377f
parent 8eee9afe280725cdd19ff299c351df19f8018a6e
parent 3da9b6f65c092eab430a94eddb8df1b0f9675e25

Merge "Revert "OPP: Do not trimDatabase if ContentProvider doesn't exist"" into tm-qpr-dev

android/app/src/com/android/bluetooth/opp/BluetoothOppService.java

diff --git a/android/app/src/com/android/bluetooth/opp/BluetoothOppService.java b/android/app/src/com/android/bluetooth/opp/BluetoothOppService.java
index f9521b0..773d771 100644
--- a/android/app/src/com/android/bluetooth/opp/BluetoothOppService.java
+++ b/android/app/src/com/android/bluetooth/opp/BluetoothOppService.java
@@ -1115,11 +1115,6 @@
 
     // Run in a background thread at boot.
     private static void trimDatabase(ContentResolver contentResolver) {
-        if (contentResolver.acquireContentProviderClient(BluetoothShare.CONTENT_URI) == null) {
-            Log.w(TAG, "ContentProvider doesn't exist");
-            return;
-        }
-
         // remove the invisible/unconfirmed inbound shares
         int delNum = contentResolver.delete(BluetoothShare.CONTENT_URI, WHERE_INVISIBLE_UNCONFIRMED,
                 null);