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

Commit 0e0fd721 authored by Mykola Podolian's avatar Mykola Podolian Committed by Android (Google) Code Review
Browse files

Merge "Updated package name retrieval in shell." into main

parents 24648805 e32a151e

libs/WindowManager/Shell/src/com/android/wm/shell/bubbles/Bubble.java

+1 −1
Original line number Diff line number Diff line
@@ -375,7 +375,7 @@ public class Bubble implements BubbleViewProvider { 
                user,

                icon,

                BubbleType.TYPE_APP,

                getAppBubbleKeyForApp(intent.getPackage(), user),

                getAppBubbleKeyForApp(ComponentUtils.getPackageName(intent), user),

                mainExecutor, bgExecutor);

    }

libs/WindowManager/Shell/src/com/android/wm/shell/common/ComponentUtils.kt

+2 −1
Original line number Diff line number Diff line
@@ -25,7 +25,8 @@ import com.android.wm.shell.ShellTaskOrganizer 
object ComponentUtils {

    /** Retrieves the package name from an [Intent].  */

    @JvmStatic

    fun getPackageName(intent: Intent?): String? = intent?.component?.packageName

    fun getPackageName(intent: Intent?): String? =

        intent?.component?.packageName ?: intent?.`package`



    /** Retrieves the package name from a [PendingIntent].  */

    @JvmStatic