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

Commit 4da3e003 authored by Ömer Faruk Yılmaz's avatar Ömer Faruk Yılmaz Committed by Automerger Merge Worker
Browse files

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

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

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/Bluetooth/+/22439003



Change-Id: I0bb93e9740f2fdce367aa245f4d415ddd7c770a1
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 9f6355f3 afe91857

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

+0 −5
Original line number Diff line number Diff line
@@ -1115,11 +1115,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);