Merge "Remove flag opp_ignore_content_observer_after_service_stop" into main

2 files changed, 1 insertions, 11 deletions

diff --git a/android/app/src/com/android/bluetooth/opp/BluetoothOppService.java b/android/app/src/com/android/bluetooth/opp/BluetoothOppService.java
index 2548b9e45c..46bed2ba89 100644
--- a/android/app/src/com/android/bluetooth/opp/BluetoothOppService.java
+++ b/android/app/src/com/android/bluetooth/opp/BluetoothOppService.java
@@ -121,7 +121,7 @@ public class BluetoothOppService extends ProfileService implements IObexConnecti
 
             // Since ContentObserver is created with Handler, onChange() can be called
             // even after the observer is unregistered.
-            if (Flags.oppIgnoreContentObserverAfterServiceStop() && mObserver != this) {
+            if (mObserver != this) {
                 Log.d(TAG, "onChange() called after stop() is called.");
                 return;
             }
diff --git a/flags/opp.aconfig b/flags/opp.aconfig
index 6d1a13bf21..cdba75b756 100644
--- a/flags/opp.aconfig
+++ b/flags/opp.aconfig
@@ -2,16 +2,6 @@ package: "com.android.bluetooth.flags"
 container: "com.android.bt"
 
 flag {
-    name: "opp_ignore_content_observer_after_service_stop"
-    namespace: "bluetooth"
-    description: "When OppService.stop() is called, previously posted ContentObserver.onChange() should not run"
-    bug: "346467641"
-    metadata {
-        purpose: PURPOSE_BUGFIX
-    }
-}
-
-flag {
     name: "opp_set_insets_for_edge_to_edge"
     namespace: "bluetooth"
     description: "Set proper insets in BluetoothOppTransferHistory to adapt to edge-to-edge."