diff options
| author | Fyodor Kupolov <fkupolov@google.com> | 2015-08-20 20:02:42 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-08-20 20:02:42 +0000 |
| commit | 78985f3fb5b424d3d4010cbe83ac85c4ea4b7fc6 (patch) | |
| tree | 89361b399e9feadc25459b3dd11790f08c26b2ee | |
| parent | 740eef52e808f2fb82b7149b8febab60222cb0a4 (diff) | |
| parent | ea57b59222571e7e82d8b628e86b4ff0bdbe3f49 (diff) | |
| download | frameworks_base-78985f3fb5b424d3d4010cbe83ac85c4ea4b7fc6.zip frameworks_base-78985f3fb5b424d3d4010cbe83ac85c4ea4b7fc6.tar.gz frameworks_base-78985f3fb5b424d3d4010cbe83ac85c4ea4b7fc6.tar.bz2 | |
am ea57b592: am 1773ded8: Merge "Fixed key comparison in equals method" into mnc-dev
* commit 'ea57b59222571e7e82d8b628e86b4ff0bdbe3f49':
Fixed key comparison in equals method
| -rw-r--r-- | core/java/android/content/RestrictionEntry.java | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/core/java/android/content/RestrictionEntry.java b/core/java/android/content/RestrictionEntry.java index ab049ec..0473475 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 |