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

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

Merge "OppService: Fix IndexOutOfBoundException in UpdateThread" into main am: b4de0a0a 

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



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

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

+12 −3
Original line number Diff line number Diff line
@@ -65,6 +65,7 @@ import com.android.bluetooth.ObexServerSockets; 
import com.android.bluetooth.btservice.AdapterService;

import com.android.bluetooth.btservice.ProfileService;

import com.android.bluetooth.content_profiles.ContentProfileErrorReportUtils;

import com.android.bluetooth.flags.Flags;

import com.android.bluetooth.sdp.SdpManagerNativeInterface;

import com.android.internal.annotations.VisibleForTesting;

import com.android.obex.ObexTransport;
@@ -289,7 +290,11 @@ public class BluetoothOppService extends ProfileService implements IObexConnecti 
                    1);

        }

        setBluetoothOppService(null);

        if (Flags.oppServiceFixIndexOutOfBoundsExceptionInUpdateThread()) {

            stopInternal();

        } else {

            mHandler.sendMessage(mHandler.obtainMessage(STOP_LISTENER));

        }



        setComponentAvailable(OPP_PROVIDER, false);

        setComponentAvailable(INCOMING_FILE_CONFIRM_ACTIVITY, false);
@@ -555,7 +560,9 @@ public class BluetoothOppService extends ProfileService implements IObexConnecti 
        if (V) {

            Log.v(TAG, "onDestroy");

        }

        if (!Flags.oppServiceFixIndexOutOfBoundsExceptionInUpdateThread()) {

            stopListeners();

        }

        if (mBatches != null) {

            mBatches.clear();

        }
@@ -685,7 +692,9 @@ public class BluetoothOppService extends ProfileService implements IObexConnecti 
                        if (V) {

                            Log.v(TAG, "Bluetooth state changed: STATE_TURNING_OFF");

                        }

                        if (!Flags.oppServiceFixIndexOutOfBoundsExceptionInUpdateThread()) {

                            mHandler.sendMessage(mHandler.obtainMessage(STOP_LISTENER));

                        }

                        break;

                }

            }