commit 4ded678f69d4ed20c197865899515115bc414f6d
author Daulet Zhanguzin <dauletz@google.com> Fri Jan 03 15:47:10 2020 +0000
committer Daulet Zhanguzin <dauletz@google.com> Mon Jan 06 12:27:49 2020 +0000
tree 32a1edeb295e651a076d67ec83092bfa85491c91
parent f0c82464026149c820c517346376bc46b3ee4f2b

Replace com.android.internal.util.Preconditions.checkNotNull with
java.util.Objects.requireNonNull

Bug: 126528330

Test: Treehugger
Change-Id: I4e61cee41affc2388328ead6dc39247b08f6b66b

service/src/com/android/car/user/CarUserService.java

diff --git a/service/src/com/android/car/user/CarUserService.java b/service/src/com/android/car/user/CarUserService.java
index f69330f..b58373e 100644
--- a/service/src/com/android/car/user/CarUserService.java
+++ b/service/src/com/android/car/user/CarUserService.java
@@ -45,7 +45,6 @@
 import com.android.car.R;
 import com.android.internal.annotations.GuardedBy;
 import com.android.internal.annotations.VisibleForTesting;
-import com.android.internal.util.Preconditions;
 import com.android.internal.util.UserIcons;
 
 import java.io.PrintWriter;
@@ -53,6 +52,7 @@
 import java.util.Arrays;
 import java.util.Iterator;
 import java.util.List;
+import java.util.Objects;
 import java.util.concurrent.CopyOnWriteArrayList;
 
 /**
@@ -202,7 +202,7 @@
     @Nullable
     public UserInfo createDriver(@NonNull String name, boolean admin) {
         checkManageUsersPermission("createDriver");
-        Preconditions.checkNotNull(name, "name cannot be null");
+        Objects.requireNonNull(name, "name cannot be null");
         if (admin) {
             return createNewAdminUser(name);
         }
@@ -216,7 +216,7 @@
     @Nullable
     public UserInfo createPassenger(@NonNull String name, @UserIdInt int driverId) {
         checkManageUsersPermission("createPassenger");
-        Preconditions.checkNotNull(name, "name cannot be null");
+        Objects.requireNonNull(name, "name cannot be null");
         UserInfo driver = mUserManager.getUserInfo(driverId);
         if (driver == null) {
             Log.w(TAG_USER, "the driver is invalid");
@@ -410,25 +410,25 @@
 
     /** Adds callback to listen to user activity events. */
     public void addUserCallback(@NonNull UserCallback callback) {
-        Preconditions.checkNotNull(callback, "callback cannot be null");
+        Objects.requireNonNull(callback, "callback cannot be null");
         mUserCallbacks.add(callback);
     }
 
     /** Removes previously added callback to listen user events. */
     public void removeUserCallback(@NonNull UserCallback callback) {
-        Preconditions.checkNotNull(callback, "callback cannot be null");
+        Objects.requireNonNull(callback, "callback cannot be null");
         mUserCallbacks.remove(callback);
     }
 
     /** Adds callback to listen to passenger activity events. */
     public void addPassengerCallback(@NonNull PassengerCallback callback) {
-        Preconditions.checkNotNull(callback, "callback cannot be null");
+        Objects.requireNonNull(callback, "callback cannot be null");
         mPassengerCallbacks.add(callback);
     }
 
     /** Removes previously added callback to listen passenger events. */
     public void removePassengerCallback(@NonNull PassengerCallback callback) {
-        Preconditions.checkNotNull(callback, "callback cannot be null");
+        Objects.requireNonNull(callback, "callback cannot be null");
         mPassengerCallbacks.remove(callback);
     }
 
@@ -601,7 +601,7 @@
      * @param r Runnable to run.
      */
     public void runOnUser0Unlock(@NonNull Runnable r) {
-        Preconditions.checkNotNull(r, "runnable cannot be null");
+        Objects.requireNonNull(r, "runnable cannot be null");
         boolean runNow = false;
         synchronized (mLockUser) {
             if (mUser0Unlocked) {