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

Commit 95081ada authored by Michael Mikhail's avatar Michael Mikhail
Browse files

Use default icon if package name is null 

SystemUI crashes when package name is not provided due to changes made in ag/24363286. There is no need to use checkNotNull as we do show default icon when package name is null.

Flag: NONE
Test: atest MediaTttSenderCoordinatorTest
Test: adb shell cmd statusbar media-ttt-chip-sender MyTablet ALMOST_CLOSE_TO_START_CAST useAppIcon=false
Bug: 215562505
Change-Id: I054c0a9930b8d21d018a8afe2c03abe8dda93c1e
parent 6fafa0de

packages/SystemUI/src/com/android/systemui/media/taptotransfer/sender/MediaTttSenderCoordinator.kt

+3 −3
Original line number Diff line number Diff line
@@ -25,12 +25,12 @@ import com.android.internal.logging.UiEventLogger 
import com.android.internal.statusbar.IUndoMediaTransferCallback

import com.android.systemui.CoreStartable

import com.android.systemui.Dumpable

import com.android.systemui.res.R

import com.android.systemui.common.shared.model.Text

import com.android.systemui.dagger.SysUISingleton

import com.android.systemui.dump.DumpManager

import com.android.systemui.media.taptotransfer.MediaTttFlags

import com.android.systemui.media.taptotransfer.common.MediaTttUtils

import com.android.systemui.res.R

import com.android.systemui.statusbar.CommandQueue

import com.android.systemui.temporarydisplay.TemporaryViewDisplayController

import com.android.systemui.temporarydisplay.ViewPriority
@@ -162,7 +162,7 @@ constructor( 
        logger: MediaTttSenderLogger,

        instanceId: InstanceId,

    ): ChipbarInfo {

        val packageName = checkNotNull(routeInfo.clientPackageName)

        val packageName = routeInfo.clientPackageName

        val otherDeviceName =

            if (routeInfo.name.isBlank()) {

                context.getString(R.string.media_ttt_default_device_type)
@@ -171,7 +171,7 @@ constructor( 
            }

        val icon =

            MediaTttUtils.getIconInfoFromPackageName(context, packageName, isReceiver = false) {

                logger.logPackageNotFound(packageName)

                packageName?.let { logger.logPackageNotFound(it) }

            }



        val timeout =