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

Commit aa1cd7a1 authored by Hyundo Moon's avatar Hyundo Moon Committed by Automerger Merge Worker
Browse files

Merge "OppService: Make sure ContentObserver is not called after stop" into... 

Merge "OppService: Make sure ContentObserver is not called after stop" into main am: fe41274b am: 3f98d2e1

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



Change-Id: I6e7ed3f2a16f399e89d4a36e31b837bf33ae4dd7
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 5834b93e 3f98d2e1

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

+7 −0
Original line number Diff line number Diff line
@@ -118,6 +118,13 @@ public class BluetoothOppService extends ProfileService implements IObexConnecti 
        @Override

        public void onChange(boolean selfChange) {

            Log.v(TAG, "ContentObserver received notification");



            // Since ContentObserver is created with Handler, onChange() can be called

            // even after the observer is unregistered.

            if (Flags.oppIgnoreContentObserverAfterServiceStop() && mObserver != this) {

                Log.d(TAG, "onChange() called after stop() is called.");

                return;

            }

            updateFromProvider();

        }

    }