drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix Location equals()

Browse Source 
Should handle extras in a better manner.

Bug: 196075248
Test: presubmits + manual
Change-Id: I89e45c289b26ea97486c5a72feb0a805c8c1a950
This commit is contained in:
Soonil Nagarkar 2021-08-10 12:18:30 -07:00
parent bc0c531069
commit 271b907bab
1 changed files with 17 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
location/java/android/location/Location.java
View File

@ -1084,6 +1084,12 @@ public class Location implements Parcelable {
mExtras = (extras == null) ? null : new Bundle(extras);
}
/**
* Location equality is provided primarily for test purposes. Comparing locations for equality
* in production may indicate incorrect assumptions, and should be avoided whenever possible.
*
* <p>{@inheritDoc}
*/
@Override
public boolean equals(Object o) {
if (this == o) {
@ -1121,7 +1127,17 @@ public class Location implements Parcelable {
&& (!hasBearingAccuracy() || Float.compare(location.mBearingAccuracyDegrees,
mBearingAccuracyDegrees) == 0)
&& Objects.equals(mProvider, location.mProvider)
&& Objects.equals(mExtras, location.mExtras);
&& areExtrasEqual(mExtras, location.mExtras);
}
private static boolean areExtrasEqual(@Nullable Bundle extras1, @Nullable Bundle extras2) {
if ((extras1 == null || extras1.isEmpty()) && (extras2 == null || extras2.isEmpty())) {
return true;
} else if (extras1 == null || extras2 == null) {
return false;
} else {
return extras1.kindofEquals(extras2);
}
}
@Override