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

Commit e5632bcb authored by heqing.liu's avatar heqing.liu Committed by 刘和青
Browse files

SystemUIBottomSheetDialog call dismiss() when hide it 

SystemUIBottomSheetDialog is missing a call to dismiss(), that cause OOM

bug: 365902595
Change-Id: Id0c9019d30017357e3c9146bb83e9726b7c18f17
parent 314fcf45

packages/SystemUI/src/com/android/systemui/display/ui/viewmodel/ConnectingDisplayViewModel.kt

+6 −6
Original line number Diff line number Diff line
@@ -79,7 +79,7 @@ constructor( 
            .combine(concurrentDisplaysInProgessFlow) { pendingDisplay, concurrentDisplaysInProgress

                ->

                if (pendingDisplay == null) {

                    hideDialog()

                    dismissDialog()

                } else {

                    showDialog(pendingDisplay, concurrentDisplaysInProgress)

                }
@@ -88,17 +88,17 @@ constructor( 
    }



    private fun showDialog(pendingDisplay: PendingDisplay, concurrentDisplaysInProgess: Boolean) {

        hideDialog()

        dismissDialog()

        dialog =

            bottomSheetFactory

                .createDialog(

                    onStartMirroringClickListener = {

                        scope.launch(bgDispatcher) { pendingDisplay.enable() }

                        hideDialog()

                        dismissDialog()

                    },

                    onCancelMirroring = {

                        scope.launch(bgDispatcher) { pendingDisplay.ignore() }

                        hideDialog()

                        dismissDialog()

                    },

                    navbarBottomInsetsProvider = { Utils.getNavbarInsets(context).bottom },

                    showConcurrentDisplayInfo = concurrentDisplaysInProgess
@@ -106,8 +106,8 @@ constructor( 
                .apply { show() }

    }



    private fun hideDialog() {

        dialog?.hide()

    private fun dismissDialog() {

        dialog?.dismiss()

        dialog = null

    }