diff options
| author | Artur Signell <artur@vaadin.com> | 2014-12-12 10:32:29 +0200 |
|---|---|---|
| committer | Artur Signell <artur@vaadin.com> | 2014-12-12 10:32:29 +0200 |
| commit | 6fdc3320fec5801a73f51d3e3a3584d23d942c6c (patch) | |
| tree | bca21a044acc56530bb403eb1cd3652c01c71928 /shared | |
| parent | b3e6edc9634f444ccece00e200cb51eee7994d75 (diff) | |
| parent | 10fa4e4236ed049ef6eac337d23701bc381763ce (diff) | |
| download | vaadin-framework-6fdc3320fec5801a73f51d3e3a3584d23d942c6c.tar.gz vaadin-framework-6fdc3320fec5801a73f51d3e3a3584d23d942c6c.zip | |
Merge remote-tracking branch 'origin/master' into grid
Conflicts:
server/tests/src/com/vaadin/data/util/BeanItemContainerTest.java
Change-Id: I04938bd8c5b4f01c3ca801c9f7adbb20d279523c
Diffstat (limited to 'shared')
| -rw-r--r-- | shared/src/com/vaadin/shared/VBrowserDetails.java | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/shared/src/com/vaadin/shared/VBrowserDetails.java b/shared/src/com/vaadin/shared/VBrowserDetails.java index fa21bddc96..6e45d33e16 100644 --- a/shared/src/com/vaadin/shared/VBrowserDetails.java +++ b/shared/src/com/vaadin/shared/VBrowserDetails.java @@ -167,14 +167,11 @@ public class VBrowserDetails implements Serializable { if (userAgent.contains("windows ")) { os = OperatingSystem.WINDOWS; isWindowsPhone = userAgent.contains("windows phone"); + } else if (userAgent.contains("android")) { + os = OperatingSystem.ANDROID; + parseAndroidVersion(userAgent); } else if (userAgent.contains("linux")) { - if (userAgent.contains("android")) { - os = OperatingSystem.ANDROID; - parseAndroidVersion(userAgent); - } else { - os = OperatingSystem.LINUX; - - } + os = OperatingSystem.LINUX; } else if (userAgent.contains("macintosh") || userAgent.contains("mac osx") || userAgent.contains("mac os x")) { |