PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Add null check in UserPreference

Browse Source 
The comparator can get null objects according to bug report.

Fixes: 130144755
Test: manual
Change-Id: Ic8a332d390f411d2eb69c944fb7fd166d9961535
This commit is contained in:
Fan Zhang
2019-04-08 13:55:58 -07:00
parent 44427259e8
commit f2390512c1
1 changed files with 15 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
src/com/android/settings/users/UserPreference.java
View File

@@ -40,18 +40,22 @@ public class UserPreference extends RestrictedPreference {
public static final int USERID_UNKNOWN = -10; public static final int USERID_UNKNOWN = -10;
public static final int USERID_GUEST_DEFAULTS = -11; public static final int USERID_GUEST_DEFAULTS = -11;
public static final Comparator<UserPreference> SERIAL_NUMBER_COMPARATOR = public static final Comparator<UserPreference> SERIAL_NUMBER_COMPARATOR =
new Comparator<UserPreference>() { (p1, p2) -> {
@Override
public int compare(UserPreference p1, UserPreference p2) { if (p1 == null) {
int sn1 = p1.getSerialNumber(); return -1;
int sn2 = p2.getSerialNumber();
if (sn1 < sn2) {
return -1;
} else if (sn1 > sn2) {
return 1;
}
return 0;
} }
else if (p2 == null) {
return 1;
}
int sn1 = p1.getSerialNumber();
int sn2 = p2.getSerialNumber();
if (sn1 < sn2) {
return -1;
} else if (sn1 > sn2) {
return 1;
}
return 0;
}; };
private OnClickListener mDeleteClickListener; private OnClickListener mDeleteClickListener;