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

Commit badfb594 authored by Treehugger Robot's avatar Treehugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Fix NPE when dragging an app to bubble from taskbar" into main

parents 4d3f2c63 a6d81a53

libs/WindowManager/Shell/multivalentTests/src/com/android/wm/shell/bubbles/BubbleTaskViewListenerTest.kt

+2 −0
Original line number Diff line number Diff line
@@ -552,7 +552,9 @@ class BubbleTaskViewListenerTest { 


    private fun createAppBubble(usePendingIntent: Boolean = false): Bubble {

        val target = Intent(context, TestActivity::class.java)

        val component = ComponentName(context, TestActivity::class.java)

        target.setPackage(context.packageName)

        target.setComponent(component)

        if (usePendingIntent) {

            // Robolectric doesn't seem to play nice with PendingIntents, have to mock it.

            val pendingIntent = mock<PendingIntent>()

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

+1 −1
Original line number Diff line number Diff line
@@ -364,7 +364,7 @@ public class Bubble implements BubbleViewProvider { 
            @ShellMainThread Executor mainExecutor, @ShellBackgroundThread Executor bgExecutor) {

        return new Bubble(intent,

                user,

                /* key= */ getAppBubbleKeyForApp(intent.getIntent().getPackage(), user),

                /* key= */ getAppBubbleKeyForApp(ComponentUtils.getPackageName(intent), user),

                mainExecutor, bgExecutor);

    }