Add the USB device parameter to usb stylus feature preference provider.
Test: StylusUsbFirmwareControllerTest
Bug: 291922092
Change-Id: Ie43bceb807e18ff56d01f6e99316db6e2820383b
diff --git a/src/com/android/settings/connecteddevice/stylus/StylusFeatureProvider.java b/src/com/android/settings/connecteddevice/stylus/StylusFeatureProvider.java
index 43337c8..7ca35d8 100644
--- a/src/com/android/settings/connecteddevice/stylus/StylusFeatureProvider.java
+++ b/src/com/android/settings/connecteddevice/stylus/StylusFeatureProvider.java
@@ -41,7 +41,8 @@
* 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<Preference> getUsbFirmwareUpdatePreferences(Context context);
+ List<Preference> 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 dba569b..be5ae40 100644
--- a/src/com/android/settings/connecteddevice/stylus/StylusFeatureProviderImpl.java
+++ b/src/com/android/settings/connecteddevice/stylus/StylusFeatureProviderImpl.java
@@ -31,7 +31,7 @@
}
@Override
- public List<Preference> getUsbFirmwareUpdatePreferences(Context context) {
+ public List<Preference> 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 4a4dfa2..9c567a4 100644
--- a/src/com/android/settings/connecteddevice/stylus/StylusUsbFirmwareController.java
+++ b/src/com/android/settings/connecteddevice/stylus/StylusUsbFirmwareController.java
@@ -88,7 +88,7 @@
StylusFeatureProvider featureProvider = FeatureFactory.getFactory(
mContext).getStylusFeatureProvider();
List<Preference> 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 5922016..2ba655a 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 @@
when(mFeatureFactory.getStylusFeatureProvider()
.isUsbFirmwareUpdateEnabled(any())).thenReturn(true);
when(mFeatureFactory.getStylusFeatureProvider()
- .getUsbFirmwareUpdatePreferences(any()))
+ .getUsbFirmwareUpdatePreferences(any(), any()))
.thenReturn(Collections.singletonList(mock(Preference.class)));
}
}