summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJulian Kast <julian@livio.com>2020-03-13 10:26:39 -0400
committerJulian Kast <julian@livio.com>2020-03-13 10:26:39 -0400
commit67b2ef63aedfb10437685e11186b0ac90963c390 (patch)
tree6ba852263864d2a018bd513a7ef9981185904fe8
parent8642a76d69bba2bbf693583f0d122e6669e06130 (diff)
downloadsdl_android-67b2ef63aedfb10437685e11186b0ac90963c390.tar.gz
Added comparing ButtonID in SoftButtonObject
-rw-r--r--base/src/main/java/com/smartdevicelink/managers/screen/SoftButtonObject.java3
1 files changed, 2 insertions, 1 deletions
diff --git a/base/src/main/java/com/smartdevicelink/managers/screen/SoftButtonObject.java b/base/src/main/java/com/smartdevicelink/managers/screen/SoftButtonObject.java
index 16a4c36af..76eb98b1e 100644
--- a/base/src/main/java/com/smartdevicelink/managers/screen/SoftButtonObject.java
+++ b/base/src/main/java/com/smartdevicelink/managers/screen/SoftButtonObject.java
@@ -319,8 +319,9 @@ public class SoftButtonObject {
int result = 1;
result += ((getName() == null) ? 0 : Integer.rotateLeft(getName().hashCode(), 1));
result += ((getCurrentStateName() == null) ? 0 : Integer.rotateLeft(getCurrentStateName().hashCode(), 2));
+ result += Integer.rotateLeft(Integer.valueOf(getButtonId()).hashCode(), 3);
for (int i = 0; i < this.states.size(); i++) {
- result += ((getStates().get(i) == null) ? 0 : Integer.rotateLeft(getStates().get(i).hashCode(), i + 2));
+ result += ((getStates().get(i) == null) ? 0 : Integer.rotateLeft(getStates().get(i).hashCode(), i + 4));
}
return result;
}