Merge "Add null check in UserPreference" into qt-dev (c11f7927) · Commits · e / os / android_packages_apps_Settings

src/com/android/settings/users/UserPreference.java

+15 −11

Original line number	Diff line number	Diff line
		@@ -40,9 +40,14 @@ public class UserPreference extends RestrictedPreference {
		public static final int USERID_UNKNOWN = -10;
		public static final int USERID_GUEST_DEFAULTS = -11;
		public static final Comparator<UserPreference> SERIAL_NUMBER_COMPARATOR =
		new Comparator<UserPreference>() {
		@Override
		public int compare(UserPreference p1, UserPreference p2) {
		(p1, p2) -> {

		if (p1 == null) {
		return -1;
		}
		else if (p2 == null) {
		return 1;
		}
		int sn1 = p1.getSerialNumber();
		int sn2 = p2.getSerialNumber();
		if (sn1 < sn2) {
		@@ -51,7 +56,6 @@ public class UserPreference extends RestrictedPreference {
		return 1;
		}
		return 0;
		}
		};

		private OnClickListener mDeleteClickListener;