Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 3daf6927 authored by Hieu Dang's avatar Hieu Dang
Browse files

Revert "OPP: Do not trimDatabase if ContentProvider doesn't exist" 

This reverts commit 998a0952.

Reason for revert: There is a merge conflict happened, the proper fix will be included in aosp/2585525

Bug: 266459454
Test: atest BluetoothInstrumentationTests
Change-Id: I9f821fb1ca64950af9dfcc46d11f50ddbe3efd2c
parent 349be0e7

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

+0 −5
Original line number Diff line number Diff line
@@ -1113,11 +1113,6 @@ public class BluetoothOppService extends ProfileService implements IObexConnecti 


    // 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);