diff options
| author | Philip P. Moltmann <moltmann@google.com> | 2016-06-09 19:40:28 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2016-06-09 19:40:28 +0000 |
| commit | be591d709c8b45248b91b1faa15580eccaa31499 (patch) | |
| tree | b99d1be1b9867f56512ee8be3f2414066cb49aa1 /packages/PrintRecommendationService/src | |
| parent | a282745fb8904645d54562d3857626f69f2e95e8 (diff) | |
| parent | 00c3ada2eb4cf9514a3efa19fbb2a4cb96182ce1 (diff) | |
Merge \\\"Handling of Fuji Xerox in RecommendationService.\\\" into nyc-dev am: 5398f2731b am: 0273d5d4ed
am: 00c3ada2eb
Change-Id: I6c92e7dc6ec2b279373f8b5dbcdebb9a11f8d9ce
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) { |