Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 5398f273 authored by Philip P. Moltmann's avatar Philip P. Moltmann Committed by Android (Google) Code Review
Browse files

Merge "Handling of Fuji Xerox in RecommendationService." into nyc-dev

parents b1a99c46 620c5af9

packages/PrintRecommendationService/res/values/strings.xml

+1 −1
Original line number Diff line number Diff line
@@ -26,6 +26,6 @@ 
    <string name="plugin_vendor_samsung">Samsung</string>

    <string name="plugin_vendor_epson">Epson</string>

    <string name="plugin_vendor_konica_minolta">Konica Minolta</string>

    <string name="plugin_vendor_fuji">Fuji</string>

    <string name="plugin_vendor_fuji_xerox">Fuji Xerox</string>

    <string name="plugin_vendor_morpia">Mopria</string>

</resources>

packages/PrintRecommendationService/res/xml/vendorconfigs.xml

+1 −1
Original line number Diff line number Diff line
@@ -60,7 +60,7 @@ 
    </vendor>



    <vendor>

        <name>@string/plugin_vendor_fuji</name>

        <name>@string/plugin_vendor_fuji_xerox</name>

        <package>jp.co.fujixerox.prt.PrintUtil.PCL</package>

        <mdns-names>

            <mdns-name>FUJI XEROX</mdns-name>

packages/PrintRecommendationService/src/com/android/printservice/recommendation/plugin/xerox/MDnsUtils.java

+4 −2
Original line number Diff line number Diff line
@@ -39,8 +39,10 @@ class MDnsUtils { 
        String usbMfg = getString(attributes.get(ATTRIBUTE__USB_MFG));

        String usbMdl = getString(attributes.get(ATTRIBUTE__USB_MDL));

        String mfg = getString(attributes.get(ATTRIBUTE__MFG));

        return containsVendor(product, vendorValues) || containsVendor(ty, vendorValues) || containsVendor(usbMfg, vendorValues) || containsVendor(mfg, vendorValues) && !(containsString(ty, EXCLUDE_FUJI) || containsString(product, EXCLUDE_FUJI) || containsString(usbMdl, EXCLUDE_FUJI));



        return (containsVendor(product, vendorValues) || containsVendor(ty, vendorValues) ||

                containsVendor(usbMfg, vendorValues) || containsVendor(mfg, vendorValues)) &&

                !(containsString(ty, EXCLUDE_FUJI) || containsString(product, EXCLUDE_FUJI) ||

                        containsString(usbMdl, EXCLUDE_FUJI));

    }



    public static String getVendor(NsdServiceInfo networkDevice) {