FIX: Fixing Android sensors not working because MakeCurrent was never called (#1434)

Author: jimon

Assets/Tests/InputSystem/CoreTests_Devices.cs

@@ -1567,6 +1567,8 @@ public void Devices_WhenCreationFails_SystemRecoversGracefully()
     public unsafe void Devices_CanBeDisabledAndReEnabled()
     {
         var device = InputSystem.AddDevice<Mouse>();
+        var nativeBackendDisableWasCalled = false;
+        var nativeBackendEnableWasCalled = false;
 
         bool? disabled = null;
         runtime.SetDeviceCommandCallback(device.deviceId,
@@ -1576,13 +1578,15 @@ public unsafe void Devices_CanBeDisabledAndReEnabled()
                 {
                     Assert.That(disabled, Is.Null);
                     disabled = true;
+                    nativeBackendDisableWasCalled = true;
                     return InputDeviceCommand.GenericSuccess;
                 }
 
                 if (commandPtr->type == EnableDeviceCommand.Type)
                 {
                     Assert.That(disabled, Is.Null);
                     disabled = false;
+                    nativeBackendEnableWasCalled = true;
                     return InputDeviceCommand.GenericSuccess;
                 }
 
@@ -1597,6 +1601,7 @@ public unsafe void Devices_CanBeDisabledAndReEnabled()
         Assert.That(device.enabled, Is.False);
         Assert.That(disabled.HasValue, Is.True);
         Assert.That(disabled.Value, Is.True);
+        Assert.That(nativeBackendDisableWasCalled, Is.True);
 
         // Make sure that state sent against the device is ignored.
         InputSystem.QueueStateEvent(device, new MouseState { buttons = 0xffff });
@@ -1611,6 +1616,7 @@ public unsafe void Devices_CanBeDisabledAndReEnabled()
         Assert.That(device.enabled, Is.True);
         Assert.That(disabled.HasValue, Is.True);
         Assert.That(disabled.Value, Is.False);
+        Assert.That(nativeBackendEnableWasCalled, Is.True);
     }
 
     [Test]
@@ -3502,6 +3508,26 @@ public void TODO_Devices_CannotChangeStateLayoutOfTouchscreen()
         Assert.Fail();
     }
 
+    [Test]
+    [Category("Devices")]
+    public void Devices_AddingDisabledSensorMakesItCurrent()
+    {
+        var deviceId = runtime.ReportNewInputDevice<Accelerometer>();
+        runtime.SetDeviceCommandCallback(deviceId,
+            new QueryEnabledStateCommand
+            {
+                baseCommand = new InputDeviceCommand(QueryEnabledStateCommand.Type, QueryEnabledStateCommand.kSize),
+                isEnabled = false
+            });
+
+        InputSystem.Update();
+
+        Assert.That(Accelerometer.current, Is.Not.Null);
+        Assert.That(Accelerometer.current.enabled, Is.False);
+
+        InputSystem.EnableDevice(Accelerometer.current);
+    }
+
     [Test]
     [Category("Devices")]
     public void Devices_CanGetSensorSamplingFrequency()

Packages/com.unity.inputsystem/CHANGELOG.md

@@ -28,6 +28,7 @@ however, it has to be formatted properly to pass verification tests.
 - Fixed "Default constructor not found for type UnityEngine.InputSystem.iOS.LowLevel.iOSStepCounter" any other potential exceptions due to classes, methods, fields and properties being stripped when managed stripping setting set to medium or high ([case 1368761](https://issuetracker.unity3d.com/issues/ios-new-input-system-iosstepcounter-crash-on-launch-with-managed-stripping)).
 - Fixed an issue where InvalidOperationExceptions are thrown if an input for an action with multiple interactions is held  while disconnecting the device([case 1354098](https://issuetracker.unity3d.com/issues/input-system-errors-are-thrown-when-disconnecting-controller-while-holding-a-button-with-press-and-release-set-up-separately)).
 - Fixed `action.ReadValue` and others returning invalid data when used from `FixedUpdate` or early update when running in play mode in the editor ([case 1368559](https://issuetracker.unity3d.com/issues/enter-key-is-not-registered-when-using-waspressedthisframe-with-input-system-1-dot-1-1) [case 1367556](https://issuetracker.unity3d.com/issues/input-action-readvalue-always-returns-zero-when-called-from-fixedupdate) [case 1372830](https://issuetracker.unity3d.com/issues/querying-inputs-before-preupdate-dot-newinputupdate-returns-invalid-data-when-running-in-play-mode-in-editor)).
+- Fixed current being `null` for sensors (`Accelerometer.current`, others) ([case 1371204](https://issuetracker.unity3d.com/issues/accelerometer-not-working-when-using-input-system-1-dot-1-1)).
 
 ### Added
 

Packages/com.unity.inputsystem/InputSystem/InputManager.cs

@@ -1162,8 +1162,9 @@ public void AddDevice(InputDevice device)
             ////REVIEW: is this really a good thing to do? just plugging in a device shouldn't make
             ////        it current, no?
             // Make the device current.
-            if (device.enabled)
-                device.MakeCurrent();
+            // BEWARE: if this will not happen for whatever reason, you will break Android sensors,
+            // as they rely on .current for enabling native backend, see https://fogbugz.unity3d.com/f/cases/1371204/
+            device.MakeCurrent();
 
             // Notify listeners.
             DelegateHelpers.InvokeCallbacksSafe(ref m_DeviceChangeListeners, device, InputDeviceChange.Added, "InputSystem.onDeviceChange");