summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Fyodor Kupolov <fkupolov@google.com> 2015-08-20 19:47:38 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 2015-08-20 19:47:38 +0000
commit1773ded84684593f459b19f3271d471b38f14f85 (patch)
treee033b116513071e171f64f76d17eac150b8bb9b1
parent46eddef4d46e11269c4f13d695c46cdd7f071a34 (diff)
parent1af7a839393152834a3659514528d8050901a4fe (diff)
Merge "Fixed key comparison in equals method" into mnc-dev
-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