Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Philip P. Moltmann
2016-06-09 19:24:04 +00:00
committed by Android (Google) Code Review
parent b1a99c46b6 620c5af97b
commit 5398f2731b
3 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
packages/PrintRecommendationService/res/values/strings.xml
View File

@@ -26,6 +26,6 @@
<string name="plugin_vendor_samsung">Samsung</string> <string name="plugin_vendor_samsung">Samsung</string>
<string name="plugin_vendor_epson">Epson</string> <string name="plugin_vendor_epson">Epson</string>
<string name="plugin_vendor_konica_minolta">Konica Minolta</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> <string name="plugin_vendor_morpia">Mopria</string>
</resources> </resources>

2
packages/PrintRecommendationService/res/xml/vendorconfigs.xml
View File

@@ -60,7 +60,7 @@
</vendor> </vendor>
<vendor> <vendor>
<name>@string/plugin_vendor_fuji</name> <name>@string/plugin_vendor_fuji_xerox</name>
<package>jp.co.fujixerox.prt.PrintUtil.PCL</package> <package>jp.co.fujixerox.prt.PrintUtil.PCL</package>
<mdns-names> <mdns-names>
<mdns-name>FUJI XEROX</mdns-name> <mdns-name>FUJI XEROX</mdns-name>

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

@@ -39,8 +39,10 @@ class MDnsUtils {
String usbMfg = getString(attributes.get(ATTRIBUTE__USB_MFG)); String usbMfg = getString(attributes.get(ATTRIBUTE__USB_MFG));
String usbMdl = getString(attributes.get(ATTRIBUTE__USB_MDL)); String usbMdl = getString(attributes.get(ATTRIBUTE__USB_MDL));
String mfg = getString(attributes.get(ATTRIBUTE__MFG)); 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) { public static String getVendor(NsdServiceInfo networkDevice) {