Merge "Add the USB device parameter to usb stylus feature preference provider." into udc-qpr-dev am: 85de68a968

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24282035

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

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<Preference> getUsbFirmwareUpdatePreferences(Context context);
+    List<Preference> getUsbFirmwareUpdatePreferences(Context context, UsbDevice usbDevice);
 }

src/com/android/settings/connecteddevice/stylus/StylusFeatureProviderImpl.java

@@ -31,7 +31,7 @@ public class StylusFeatureProviderImpl implements StylusFeatureProvider {
     }
 
     @Override
-    public List<Preference> getUsbFirmwareUpdatePreferences(Context context) {
+    public List<Preference> getUsbFirmwareUpdatePreferences(Context context, UsbDevice usbDevice) {
         return null;
     }
 }

src/com/android/settings/connecteddevice/stylus/StylusUsbFirmwareController.java

@@ -88,7 +88,7 @@ public class StylusUsbFirmwareController extends BasePreferenceController
             StylusFeatureProvider featureProvider = FeatureFactory.getFactory(
                     mContext).getStylusFeatureProvider();
             List<Preference> preferences =
-                    featureProvider.getUsbFirmwareUpdatePreferences(mContext);
+                    featureProvider.getUsbFirmwareUpdatePreferences(mContext, mStylusUsbDevice);
 
             if (preferences != null) {
                 mPreference = new PreferenceCategory(mContext);

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)));
     }
 }