Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "App bubble bar bubbles crash fix" into udc-dev

Browse Source
This commit is contained in:
Ivan Tkachenko
2023-04-27 15:30:58 +00:00
committed by Android (Google) Code Review
parent 9f9b600eca c9e7623312
commit 8a5e18bc5f
3 changed files with 36 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -297,7 +297,7 @@ public class Bubble implements BubbleViewProvider {
public BubbleInfo asBubbleBarBubble() {
return new BubbleInfo(getKey(),
getFlags(),
getShortcutInfo().getId(),
getShortcutId(),
getIcon(),
getUser().getIdentifier(),
getPackageName());

5
libs/WindowManager/Shell/src/com/android/wm/shell/common/bubbles/BubbleInfo.java
View File

@@ -35,6 +35,7 @@ public class BubbleInfo implements Parcelable {
private String mKey; // Same key as the Notification
private int mFlags; // Flags from BubbleMetadata
@Nullable
private String mShortcutId;
private int mUserId;
private String mPackageName;
@@ -46,7 +47,7 @@ public class BubbleInfo implements Parcelable {
@Nullable
private Icon mIcon;
public BubbleInfo(String key, int flags, String shortcutId, @Nullable Icon icon,
public BubbleInfo(String key, int flags, @Nullable String shortcutId, @Nullable Icon icon,
int userId, String packageName) {
mKey = key;
mFlags = flags;
@@ -69,10 +70,12 @@ public class BubbleInfo implements Parcelable {
return mKey;
}
@Nullable
public String getShortcutId() {
return mShortcutId;
}
@Nullable
public Icon getIcon() {
return mIcon;
}

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

@@ -33,6 +33,7 @@ import android.content.pm.ShortcutInfo;
import android.content.res.Resources;
import android.graphics.drawable.Icon;
import android.os.Bundle;
import android.os.UserHandle;
import android.service.notification.StatusBarNotification;
import android.testing.AndroidTestingRunner;
import android.testing.TestableLooper;
@@ -42,6 +43,7 @@ import androidx.test.filters.SmallTest;
import com.android.wm.shell.R;
import com.android.wm.shell.ShellTestCase;
import com.android.wm.shell.common.ShellExecutor;
import com.android.wm.shell.common.bubbles.BubbleInfo;
import org.junit.Before;
import org.junit.Test;
@@ -77,7 +79,7 @@ public class BubbleTest extends ShellTestCase {
Intent target = new Intent(mContext, BubblesTestActivity.class);
Notification.BubbleMetadata metadata = new Notification.BubbleMetadata.Builder(
PendingIntent.getActivity(mContext, 0, target, PendingIntent.FLAG_MUTABLE),
Icon.createWithResource(mContext, R.drawable.bubble_ic_create_bubble))
Icon.createWithResource(mContext, R.drawable.bubble_ic_create_bubble))
.build();
when(mSbn.getNotification()).thenReturn(mNotif);
when(mNotif.getBubbleMetadata()).thenReturn(metadata);
@@ -179,6 +181,34 @@ public class BubbleTest extends ShellTestCase {
assertThat(bubble.isConversation()).isFalse();
}
@Test
public void testBubbleAsBubbleBarBubble_withShortcut() {
Bubble bubble = createBubbleWithShortcut();
BubbleInfo bubbleInfo = bubble.asBubbleBarBubble();
assertThat(bubble.getShortcutInfo()).isNotNull();
assertThat(bubbleInfo.getShortcutId()).isNotNull();
assertThat(bubbleInfo.getShortcutId()).isEqualTo(bubble.getShortcutId());
assertThat(bubbleInfo.getKey()).isEqualTo(bubble.getKey());
assertThat(bubbleInfo.getUserId()).isEqualTo(bubble.getUser().getIdentifier());
assertThat(bubbleInfo.getPackageName()).isEqualTo(bubble.getPackageName());
}
@Test
public void testBubbleAsBubbleBarBubble_withoutShortcut() {
Intent intent = new Intent(mContext, BubblesTestActivity.class);
intent.setPackage(mContext.getPackageName());
Bubble bubble = Bubble.createAppBubble(intent, new UserHandle(1 /* userId */),
null /* icon */, mMainExecutor);
BubbleInfo bubbleInfo = bubble.asBubbleBarBubble();
assertThat(bubble.getShortcutInfo()).isNull();
assertThat(bubbleInfo.getShortcutId()).isNull();
assertThat(bubbleInfo.getKey()).isEqualTo(bubble.getKey());
assertThat(bubbleInfo.getUserId()).isEqualTo(bubble.getUser().getIdentifier());
assertThat(bubbleInfo.getPackageName()).isEqualTo(bubble.getPackageName());
}
private Bubble createBubbleWithShortcut() {
ShortcutInfo shortcutInfo = new ShortcutInfo.Builder(mContext)
.setId("mockShortcutId")