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

Commit ad4ade41 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 am: aa733345 am: 34f086d1

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



Change-Id: I6794861de9909c92277ed4b01d0d87a495431496
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 024a6e0c 34f086d1

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