Merge "Report toolType on handwriting start" into udc-dev am: 00abd17625

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/23375872

Change-Id: I3b0eb27d9438971d39716f21436acf4b8232da3e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

core/java/android/view/ViewRootImpl.java

@@ -7017,6 +7017,10 @@ public final class ViewRootImpl implements ViewParent,
         private int processPointerEvent(QueuedInputEvent q) {
             final MotionEvent event = (MotionEvent)q.mEvent;
             boolean handled = mHandwritingInitiator.onTouchEvent(event);
+            if (handled) {
+                // If handwriting is started, toolkit doesn't receive ACTION_UP.
+                mLastClickToolType = event.getToolType(event.getActionIndex());
+            }
 
             mAttachInfo.mUnbufferedDispatchRequested = false;
             mAttachInfo.mHandlingPointerEvent = true;