Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am 78985f3f: am ea57b592: am 1773ded8: Merge "Fixed key comparison in equals method" into mnc-dev

Browse Source 
* commit '78985f3fb5b424d3d4010cbe83ac85c4ea4b7fc6':
  Fixed key comparison in equals method
This commit is contained in:
Fyodor Kupolov
2015-08-20 20:12:08 +00:00
committed by Android Git Automerger
parent b6e737e50a 78985f3fb5
commit 1ffb592e0b
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
core/java/android/content/RestrictionEntry.java
View File

@@ -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