commit c11f7927954d1e6d1ea718c57f908b24b082e4c8
author TreeHugger Robot <treehugger-gerrit@google.com> Tue Apr 09 05:24:21 2019 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Tue Apr 09 05:24:21 2019 +0000
tree 8768afbc6de1bc91c5e1b1c2a04a2ca74c6a43ca
parent 48ed84ebf4deafc3a7e741b6fd69187996b5a124
parent f2390512c166866f694066a8274b8ea0d686fd06

Merge "Add null check in UserPreference" into qt-dev

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

diff --git a/src/com/android/settings/users/UserPreference.java b/src/com/android/settings/users/UserPreference.java
index d87d78e..3603d44 100644
--- a/src/com/android/settings/users/UserPreference.java
+++ b/src/com/android/settings/users/UserPreference.java
@@ -40,18 +40,22 @@
     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) {
-                    int sn1 = p1.getSerialNumber();
-                    int sn2 = p2.getSerialNumber();
-                    if (sn1 < sn2) {
-                        return -1;
-                    } else if (sn1 > sn2) {
-                        return 1;
-                    }
-                    return 0;
+            (p1, p2) -> {
+
+                if (p1 == null) {
+                    return -1;
                 }
+                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;