summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Fyodor Kupolov <fkupolov@google.com> 2015-08-20 19:56:02 +0000
committer Android Git Automerger <android-git-automerger@android.com> 2015-08-20 19:56:02 +0000
commit8a363bb13de1fb0600a69352a0fb4a844fba21e2 (patch)
tree5b44db18c97be62fc2e5a040a631c36a220248f1
parent1262059c072375cd5bd48e86b7ee69d66848494d (diff)
parent1773ded84684593f459b19f3271d471b38f14f85 (diff)
am 1773ded8: Merge "Fixed key comparison in equals method" into mnc-dev
* commit '1773ded84684593f459b19f3271d471b38f14f85': Fixed key comparison in equals method
-rw-r--r--core/java/android/content/RestrictionEntry.java2
1 files changed, 1 insertions, 1 deletions
diff --git a/core/java/android/content/RestrictionEntry.java b/core/java/android/content/RestrictionEntry.java
index ab049ecbed95..0473475c1a77 100644
--- a/core/java/android/content/RestrictionEntry.java
+++ b/core/java/android/content/RestrictionEntry.java
@@ -456,7 +456,7 @@ public class RestrictionEntry implements Parcelable {
if (o == this) return true;
if (!(o instanceof RestrictionEntry)) return false;
final RestrictionEntry other = (RestrictionEntry) o;
- if (mType != other.mType || mKey.equals(other.mKey)) {
+ if (mType != other.mType || !mKey.equals(other.mKey)) {
return false;
}
if (mCurrentValues == null && other.mCurrentValues == null