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

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

Merge "MAP: Dismiss permission dialog on service stop" into main am: 7f103a3b am: 50f30ee5 

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



Change-Id: I07063a49e8055dfd40434b3305972cb71ba28f0a
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents ef411854 50f30ee5

android/app/src/com/android/bluetooth/map/BluetoothMapService.java

+2 −6
Original line number Original line Diff line number Diff line
@@ -1061,13 +1061,9 @@ public class BluetoothMapService extends ProfileService { 
    }

    }





    private void sendShutdownMessage() {

    private void sendShutdownMessage() {

        // Pending messages are no longer valid. To speed up things, simply delete them.

        // We should close the Setting's permission dialog if one is open.

        if (mRemoveTimeoutMsg) {

        if (mRemoveTimeoutMsg) {

            Intent timeoutIntent = new Intent(USER_CONFIRM_TIMEOUT_ACTION);

            sendConnectTimeoutMessage();

            Utils.sendBroadcast(this, timeoutIntent, null,

                    Utils.getTempAllowlistBroadcastOptions());

            mIsWaitingAuthorization = false;

            cancelUserTimeoutAlarm();

        }

        }

        if (mSessionStatusHandler == null) {

        if (mSessionStatusHandler == null) {

            Log.w(TAG, "mSessionStatusHandler is null");

            Log.w(TAG, "mSessionStatusHandler is null");