Merge "Revert "Remove bubble when PendingIntent is canceled"" into rvc-dev am:...

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;

    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();

        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);

    }