Revert "Remove bubble when PendingIntent is canceled"

This reverts commit 4cbc14285f.

Reason for revert: unintentional side effects that would impact dogfood

Change-Id: I2961d0e67cee52fc49b04d8857d4b8717433cea5
Bug: 151104690
This commit is contained in:
Mady Mellor
2020-04-27 21:20:27 +00:00
parent 4cbc14285f
commit 2e09b5d479

View File

@@ -54,7 +54,6 @@ import android.content.pm.ActivityInfo;
import android.content.pm.PackageManager;
import android.content.res.Configuration;
import android.graphics.Rect;
import android.os.Handler;
import android.os.RemoteException;
import android.os.ServiceManager;
import android.service.notification.NotificationListenerService;
@@ -175,9 +174,6 @@ public class BubbleController implements ConfigurationController.ConfigurationLi
private IStatusBarService mBarService;
private SysUiState mSysUiState;
// Used to post to main UI thread
private Handler mHandler = new Handler();
// Used for determining view rect for touch interaction
private Rect mTempRect = new Rect();
@@ -803,17 +799,7 @@ public class BubbleController implements ConfigurationController.ConfigurationLi
Bubble bubble = mBubbleData.getOrCreateBubble(notif);
bubble.setInflateSynchronously(mInflateSynchronously);
bubble.inflate(
b -> {
mBubbleData.notificationEntryUpdated(b, suppressFlyout, showInShade);
if (bubble.getBubbleIntent() == null) {
return;
}
bubble.getBubbleIntent().registerCancelListener(pendingIntent -> {
mHandler.post(
() -> removeBubble(bubble.getEntry(),
BubbleController.DISMISS_INVALID_INTENT));
});
},
b -> mBubbleData.notificationEntryUpdated(b, suppressFlyout, showInShade),
mContext, mStackView, mBubbleIconFactory);
}