From dde063bf20f24216bb995ab712eda2d6270b9c88 Mon Sep 17 00:00:00 2001 From: Lucas Dupin Date: Fri, 24 Jan 2020 08:57:50 -0800 Subject: [PATCH] Fix lint warning Preconditions#checkNotNull was deprecated. java.util.Objects.requireNonNull should be used instead Test: make Change-Id: I9555e3c7b523bfe74fe96d0a405e9028d136668b --- .../SystemUI/src/com/android/systemui/DumpController.kt | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/packages/SystemUI/src/com/android/systemui/DumpController.kt b/packages/SystemUI/src/com/android/systemui/DumpController.kt index f14c4cd8e6c6b..7a83a8948bb0a 100644 --- a/packages/SystemUI/src/com/android/systemui/DumpController.kt +++ b/packages/SystemUI/src/com/android/systemui/DumpController.kt @@ -19,10 +19,10 @@ package com.android.systemui import android.util.ArraySet import android.util.Log import androidx.annotation.GuardedBy -import com.android.internal.util.Preconditions import java.io.FileDescriptor import java.io.PrintWriter import java.lang.ref.WeakReference +import java.util.Objects.requireNonNull import javax.inject.Inject import javax.inject.Singleton @@ -58,7 +58,7 @@ class DumpController @Inject constructor() : Dumpable { * @param dumpable the [Dumpable] to be added */ fun registerDumpable(dumpable: Dumpable) { - Preconditions.checkNotNull(dumpable, "The dumpable to be added cannot be null") + requireNonNull(dumpable, "The dumpable to be added cannot be null") registerDumpable(dumpable.javaClass.simpleName, dumpable) } @@ -71,7 +71,7 @@ class DumpController @Inject constructor() : Dumpable { * @param dumpable the [Dumpable] to be added */ fun registerDumpable(tag: String, dumpable: Dumpable) { - Preconditions.checkNotNull(dumpable, "The dumpable to be added cannot be null") + requireNonNull(dumpable, "The dumpable to be added cannot be null") if (DEBUG) Log.v(TAG, "*** register callback for $dumpable") synchronized(listeners) { if (listeners.any { it.tag == tag }) {