diff options
| author | Philip P. Moltmann <moltmann@google.com> | 2016-06-09 09:39:55 -0700 |
|---|---|---|
| committer | Philip P. Moltmann <moltmann@google.com> | 2016-06-09 09:40:00 -0700 |
| commit | 620c5af97b556031c16f43c5c0410f7a5b0a3ec8 (patch) | |
| tree | 376da8a816241db4ca769d3e323af619f4e74b0b | |
| parent | 9b5a78072281ebf0182234d56b6ec174e911d24e (diff) | |
Handling of Fuji Xerox in RecommendationService.
- Display name
- Fix exclusion of Fuji from Xerox plugin
Bug: 28908572
Change-Id: I00c235a4eb09a681717eb3be65d586246a069f4b
3 files changed, 6 insertions, 4 deletions
diff --git a/packages/PrintRecommendationService/res/values/strings.xml b/packages/PrintRecommendationService/res/values/strings.xml index 348fcace90c5..b6c45b7a23c8 100644 --- a/packages/PrintRecommendationService/res/values/strings.xml +++ b/packages/PrintRecommendationService/res/values/strings.xml @@ -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> diff --git a/packages/PrintRecommendationService/res/xml/vendorconfigs.xml b/packages/PrintRecommendationService/res/xml/vendorconfigs.xml index 52889ce186a4..703cf6f45ddf 100644 --- a/packages/PrintRecommendationService/res/xml/vendorconfigs.xml +++ b/packages/PrintRecommendationService/res/xml/vendorconfigs.xml @@ -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> diff --git a/packages/PrintRecommendationService/src/com/android/printservice/recommendation/plugin/xerox/MDnsUtils.java b/packages/PrintRecommendationService/src/com/android/printservice/recommendation/plugin/xerox/MDnsUtils.java index 7a2d0d8957ea..b0da08bf3003 100755 --- a/packages/PrintRecommendationService/src/com/android/printservice/recommendation/plugin/xerox/MDnsUtils.java +++ b/packages/PrintRecommendationService/src/com/android/printservice/recommendation/plugin/xerox/MDnsUtils.java @@ -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) { |