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

Commit 93007ce7 authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "OPP: Do not trimDatabase if ContentProvider doesn't exist" am: a89a8d84 

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



Change-Id: I55e625e43d6d38960596836d9ab44969c629740c
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents d3ea0610 a89a8d84

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

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