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

Commit bcf87a8c authored by Jiaming Cheng's avatar Jiaming Cheng Committed by Android (Google) Code Review
Browse files

Merge "Fix the bluetooth tile crash" into main

parents 7f9fcf19 4330b175

packages/SystemUI/src/com/android/systemui/bluetooth/qsdialog/BluetoothDetailsContentManager.kt

+0 −4
Original line number Diff line number Diff line
@@ -49,7 +49,6 @@ import com.android.systemui.animation.DialogTransitionAnimator 
import com.android.systemui.bluetooth.ui.viewModel.BluetoothDetailsContentViewModel

import com.android.systemui.dagger.qualifiers.Main

import com.android.systemui.plugins.ActivityStarter

import com.android.systemui.qs.flags.QsDetailedView

import com.android.systemui.res.R

import com.android.systemui.statusbar.phone.SystemUIDialog

import com.android.systemui.util.annotations.DeprecatedSysuiVisibleForTesting
@@ -198,9 +197,6 @@ constructor( 
            progressBarBackground =

                contentView.requireViewById(R.id.bluetooth_tile_dialog_progress_background)



            // If `QsDetailedView` is enabled, it should show the details view.

            QsDetailedView.assertInLegacyMode()



            // If rendering with tile details view, the title and subtitle will be added in the

            // `TileDetails`

            titleTextView = contentView.requireViewById(R.id.bluetooth_tile_dialog_title)

packages/SystemUI/src/com/android/systemui/bluetooth/ui/viewModel/BluetoothDetailsContentViewModel.kt

+0 −3
Original line number Diff line number Diff line
@@ -132,9 +132,6 @@ constructor( 


    /** Shows the bluetooth dialog. */

    fun showDialog(expandable: Expandable?) {

        // If `QsDetailedView` is enabled, it should show the details view.

        QsDetailedView.assertInLegacyMode()



        cancelJob()



        job =