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 /packages/PrintRecommendationService/src | |
| parent | 9b5a78072281ebf0182234d56b6ec174e911d24e (diff) | |
Handling of Fuji Xerox in RecommendationService.
- Display name
- Fix exclusion of Fuji from Xerox plugin
Bug: 28908572
Change-Id: I00c235a4eb09a681717eb3be65d586246a069f4b
Diffstat (limited to 'packages/PrintRecommendationService/src')
| -rwxr-xr-x | packages/PrintRecommendationService/src/com/android/printservice/recommendation/plugin/xerox/MDnsUtils.java | 6 |
1 files changed, 4 insertions, 2 deletions
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) { |