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

Commit 624b5643 authored by Mady Mellor's avatar Mady Mellor Committed by Android (Google) Code Review
Browse files

Merge "Ensure that we set an intent for bubbles created via TaskInfo" into main

parents 817428e7 9d7cd506

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

+1 −1
Original line number Diff line number Diff line
@@ -347,7 +347,7 @@ public class Bubble implements BubbleViewProvider { 
        mMainExecutor = mainExecutor;

        mBgExecutor = bgExecutor;

        mTaskId = task.taskId;

        mIntent = null;

        mIntent = task.baseIntent;

        mDesiredHeight = Integer.MAX_VALUE;

        mPackageName = task.baseActivity.getPackageName();

    }

libs/WindowManager/Shell/tests/unittest/src/com/android/wm/shell/bubbles/BubbleTest.java

+2 −0
Original line number Diff line number Diff line
@@ -227,10 +227,12 @@ public class BubbleTest extends ShellTestCase { 
        when(componentName.getPackageName()).thenReturn(mContext.getPackageName());

        info.taskId = 1;

        info.baseActivity = componentName;

        info.baseIntent = createIntent();

        Bubble bubble = Bubble.createTaskBubble(info, UserHandle.of(0),

                mock(Icon.class),

                mMainExecutor, mBgExecutor);

        assertThat(bubble.isApp()).isTrue();

        assertThat(bubble.getIntent()).isNotNull();

    }



    @Test