diff --git a/src/com/android/settings/connecteddevice/stylus/StylusFeatureProvider.java b/src/com/android/settings/connecteddevice/stylus/StylusFeatureProvider.java index 43337c85127..7ca35d87f45 100644 --- a/src/com/android/settings/connecteddevice/stylus/StylusFeatureProvider.java +++ b/src/com/android/settings/connecteddevice/stylus/StylusFeatureProvider.java @@ -41,7 +41,8 @@ public interface StylusFeatureProvider { * the list will contain only the preference showing the current firmware version. * * @param context The context + * @param usbDevice The USB device for which to generate preferences. */ @Nullable - List getUsbFirmwareUpdatePreferences(Context context); + List getUsbFirmwareUpdatePreferences(Context context, UsbDevice usbDevice); } diff --git a/src/com/android/settings/connecteddevice/stylus/StylusFeatureProviderImpl.java b/src/com/android/settings/connecteddevice/stylus/StylusFeatureProviderImpl.java index dba569b7959..be5ae407d07 100644 --- a/src/com/android/settings/connecteddevice/stylus/StylusFeatureProviderImpl.java +++ b/src/com/android/settings/connecteddevice/stylus/StylusFeatureProviderImpl.java @@ -31,7 +31,7 @@ public class StylusFeatureProviderImpl implements StylusFeatureProvider { } @Override - public List getUsbFirmwareUpdatePreferences(Context context) { + public List getUsbFirmwareUpdatePreferences(Context context, UsbDevice usbDevice) { return null; } } diff --git a/src/com/android/settings/connecteddevice/stylus/StylusUsbFirmwareController.java b/src/com/android/settings/connecteddevice/stylus/StylusUsbFirmwareController.java index 4a4dfa271a8..9c567a46c81 100644 --- a/src/com/android/settings/connecteddevice/stylus/StylusUsbFirmwareController.java +++ b/src/com/android/settings/connecteddevice/stylus/StylusUsbFirmwareController.java @@ -88,7 +88,7 @@ public class StylusUsbFirmwareController extends BasePreferenceController StylusFeatureProvider featureProvider = FeatureFactory.getFactory( mContext).getStylusFeatureProvider(); List preferences = - featureProvider.getUsbFirmwareUpdatePreferences(mContext); + featureProvider.getUsbFirmwareUpdatePreferences(mContext, mStylusUsbDevice); if (preferences != null) { mPreference = new PreferenceCategory(mContext); diff --git a/tests/robotests/src/com/android/settings/connecteddevice/stylus/StylusUsbFirmwareControllerTest.java b/tests/robotests/src/com/android/settings/connecteddevice/stylus/StylusUsbFirmwareControllerTest.java index 59220164a62..2ba655ab452 100644 --- a/tests/robotests/src/com/android/settings/connecteddevice/stylus/StylusUsbFirmwareControllerTest.java +++ b/tests/robotests/src/com/android/settings/connecteddevice/stylus/StylusUsbFirmwareControllerTest.java @@ -157,7 +157,7 @@ public class StylusUsbFirmwareControllerTest { when(mFeatureFactory.getStylusFeatureProvider() .isUsbFirmwareUpdateEnabled(any())).thenReturn(true); when(mFeatureFactory.getStylusFeatureProvider() - .getUsbFirmwareUpdatePreferences(any())) + .getUsbFirmwareUpdatePreferences(any(), any())) .thenReturn(Collections.singletonList(mock(Preference.class))); } }