diff options
| -rw-r--r-- | sched/src/com/android/sched/util/Version.java | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/sched/src/com/android/sched/util/Version.java b/sched/src/com/android/sched/util/Version.java index 3128edd..0586680 100644 --- a/sched/src/com/android/sched/util/Version.java +++ b/sched/src/com/android/sched/util/Version.java @@ -201,13 +201,14 @@ public class Version { ^ (codeBase != null ? codeBase.hashCode() : 0); } - int compareTo(@Nonnull Version other) throws UncomparableVersion { - if (subReleaseKind == SubReleaseKind.ENGINEERING + public boolean isComparable() { + return !(subReleaseKind == SubReleaseKind.ENGINEERING || releaseCode <= 0 - || subReleaseCode <= 0 - || other.getSubReleaseKind() == SubReleaseKind.ENGINEERING - || other.getReleaseCode() <= 0 - || other.getSubReleaseCode() <= 0) { + || subReleaseCode <= 0); + } + + int compareTo(@Nonnull Version other) throws UncomparableVersion { + if (!isComparable() || !other.isComparable()) { throw new UncomparableVersion( getVerboseVersion() + " is not comparable with " + other.getVerboseVersion()); } |