Merge "Fix NPE notifyActivityPinned"

    };

    private final TaskStackConsumer mNotifyActivityPinned = (l, m) -> {

        final ActivityRecord r = (ActivityRecord) m.obj;

        l.onActivityPinned(r.packageName, r.userId, r.getTask().taskId, r.getStackId());

        l.onActivityPinned((String) m.obj /* packageName */, m.sendingUid /* userId */,

                m.arg1 /* taskId */, m.arg2 /* stackId */);

    };

    private final TaskStackConsumer mNotifyActivityUnpinned = (l, m) -> {

    /** Notifies all listeners when an Activity is pinned. */

    void notifyActivityPinned(ActivityRecord r) {

        mHandler.removeMessages(NOTIFY_ACTIVITY_PINNED_LISTENERS_MSG);

        final Message msg = mHandler.obtainMessage(NOTIFY_ACTIVITY_PINNED_LISTENERS_MSG, r);

        final Message msg = mHandler.obtainMessage(NOTIFY_ACTIVITY_PINNED_LISTENERS_MSG,

                r.getTask().taskId, r.getStackId(), r.packageName);

        msg.sendingUid = r.userId;

        forAllLocalListeners(mNotifyActivityPinned, msg);

        msg.sendToTarget();

    }