Apply changes based on review

Author: jfreire-unity

Assets/Tests/InputSystem/Plugins/UITests.cs

@@ -1720,7 +1720,6 @@ public IEnumerator UI_CanReleaseAndPressTouchesOnSameFrame()
         scene.leftChildReceiver.events.Clear();
 
         Assert.That(scene.eventSystem.IsPointerOverGameObject(), Is.False);
-        Assert.That(scene.eventSystem.IsPointerOverGameObject(touchScreen.deviceId), Is.False);
         Assert.That(scene.eventSystem.IsPointerOverGameObject(1), Is.False);
         Assert.That(scene.eventSystem.IsPointerOverGameObject(2), Is.False);
 
@@ -1733,7 +1732,6 @@ public IEnumerator UI_CanReleaseAndPressTouchesOnSameFrame()
         var pointerIdTouch2 = ExtendedPointerEventData.MakePointerIdForTouch(touchScreen.deviceId, 2);
 
         Assert.That(scene.eventSystem.IsPointerOverGameObject(), Is.True);
-        Assert.That(scene.eventSystem.IsPointerOverGameObject(touchScreen.deviceId), Is.True);
         Assert.That(scene.eventSystem.IsPointerOverGameObject(1), Is.True);
         Assert.That(scene.eventSystem.IsPointerOverGameObject(2), Is.False);
 
@@ -1763,7 +1761,6 @@ public IEnumerator UI_CanReleaseAndPressTouchesOnSameFrame()
         yield return null;
 
         Assert.That(scene.eventSystem.IsPointerOverGameObject(), Is.True);
-        Assert.That(scene.eventSystem.IsPointerOverGameObject(touchScreen.deviceId), Is.True);
         Assert.That(scene.eventSystem.IsPointerOverGameObject(1), Is.True);
         Assert.That(scene.eventSystem.IsPointerOverGameObject(2), Is.True);
 
@@ -1799,7 +1796,6 @@ public IEnumerator UI_CanReleaseAndPressTouchesOnSameFrame()
         yield return null;
 
         Assert.That(scene.eventSystem.IsPointerOverGameObject(), Is.True);
-        Assert.That(scene.eventSystem.IsPointerOverGameObject(touchScreen.deviceId), Is.True);
         Assert.That(scene.eventSystem.IsPointerOverGameObject(1), Is.True);
         Assert.That(scene.eventSystem.IsPointerOverGameObject(2), Is.True);
 
@@ -1826,7 +1822,6 @@ public IEnumerator UI_CanReleaseAndPressTouchesOnSameFrame()
         yield return null;
 
         Assert.That(scene.eventSystem.IsPointerOverGameObject(), Is.False);
-        Assert.That(scene.eventSystem.IsPointerOverGameObject(touchScreen.deviceId), Is.False);
         Assert.That(scene.eventSystem.IsPointerOverGameObject(1), Is.False);
         Assert.That(scene.eventSystem.IsPointerOverGameObject(2), Is.False);
 

Packages/com.unity.inputsystem/CHANGELOG.md

@@ -12,7 +12,8 @@ however, it has to be formatted properly to pass verification tests.
 
 ### Fixed
 - Fixed an issue causing the Action context menu to not show on right click when right clicking an action in the Input Action Editor [ISXB-1134](https://issuetracker.unity3d.com/product/unity/issues/guid/ISXB-1134).
-- Fixed `ArgumentNullException: Value cannot be null.` during the migration of Project-wide Input Actions from `InputManager.asset` to `InputSystem_Actions.inputactions` asset which lead do the lost of the configuration [ISXB-1105](https://issuetracker.unity3d.com/product/unity/issues/guid/ISXB-1105)
+- Fixed `ArgumentN- Fixed pointerId staying the same when simultaneously releasing and then pressing in the same frame on mobile using touch. [ISXB-1006](https://issuetracker.unity3d.com/product/unity/issues/guid/ISXB-845)
+- Fixed pointerId staying the same when simultaneously releasing and then pressing in the same frame on mobile using touch. [ISXB-1006](https://issuetracker.unity3d.com/product/unity/issues/guid/ISXB-845)
 
 ### Changed
 - Added back the InputManager to InputSystem project-wide asset migration code with performance improvement (ISX-2086)

Packages/com.unity.inputsystem/InputSystem/Plugins/UI/InputSystemUIInputModule.cs

@@ -1746,8 +1746,7 @@ private int GetPointerStateIndexFor(InputControl control, bool createIfNotExists
                 ref var pointerState = ref GetPointerStateForIndex(touchControlIndex);
 
                 if (!(pointerTouchControl is TouchControl) ||
-                    (pointerTouchControl is TouchControl &&
-                     pointerState.eventData.touchId == ((TouchControl)pointerTouchControl).touchId.value))
+                    (pointerState.eventData.touchId == ((TouchControl)pointerTouchControl).touchId.value))
                 {
                     // For touches, we cache a reference to the control of a pointer so that we don't
                     // have to continuously do ReadValue() on the touch ID control.