Move to Kotlin requireNotNull() from Preconditions.checkNotNull()

Replace last usage of Preconditions.checkNotNull() in Permission code.

We are in Kotlin so the Kotlin way can be preferred.

Somehow the JSpecify @NonNull from Preconditions.checkNotNull()
isn't being recognized as non-null by the Kotlin compiler used for
the code here and that's blocking AndroidX prebuilt drop, so let's
get out of the way for that first, while improving our code a tiny
bit.

Bug: 385912424
Flag: EXEMPT bugfix
Relnote: N/A
Test: build
Merged-In: I42504a24a8544b56dbbbf5e0cd707355304717de
Merged-In: Ie7a14d7d4ea5384d8ffc427bd6e9a65f8e6071b2
Change-Id: Ie7a14d7d4ea5384d8ffc427bd6e9a65f8e6071b2

3 files changed, 3 insertions, 8 deletions

diff --git a/PermissionController/src/com/android/permissioncontroller/privacysources/AccessibilitySourceService.kt b/PermissionController/src/com/android/permissioncontroller/privacysources/AccessibilitySourceService.kt
index c633c013a..1610901bc 100644
--- a/PermissionController/src/com/android/permissioncontroller/privacysources/AccessibilitySourceService.kt
+++ b/PermissionController/src/com/android/permissioncontroller/privacysources/AccessibilitySourceService.kt
@@ -48,7 +48,6 @@ import androidx.annotation.GuardedBy
 import androidx.annotation.RequiresApi
 import androidx.annotation.VisibleForTesting
 import androidx.annotation.WorkerThread
-import androidx.core.util.Preconditions
 import com.android.modules.utils.build.SdkLevel
 import com.android.permissioncontroller.Constants
 import com.android.permissioncontroller.PermissionControllerStatsLog
@@ -712,7 +711,7 @@ class AccessibilityPackageResetHandler : BroadcastReceiver() {
             return
         }
 
-        val data = Preconditions.checkNotNull(intent.data)
+        val data = requireNotNull(intent.data)
         val coroutineScope = CoroutineScope(Dispatchers.Default + SupervisorJob())
         coroutineScope.launch(Dispatchers.Default) {
             if (DEBUG) {
diff --git a/PermissionController/src/com/android/permissioncontroller/privacysources/NotificationListenerCheck.kt b/PermissionController/src/com/android/permissioncontroller/privacysources/NotificationListenerCheck.kt
index 43b3edc04..58a6f1bc4 100644
--- a/PermissionController/src/com/android/permissioncontroller/privacysources/NotificationListenerCheck.kt
+++ b/PermissionController/src/com/android/permissioncontroller/privacysources/NotificationListenerCheck.kt
@@ -57,7 +57,6 @@ import androidx.annotation.GuardedBy
 import androidx.annotation.RequiresApi
 import androidx.annotation.VisibleForTesting
 import androidx.annotation.WorkerThread
-import androidx.core.util.Preconditions
 import com.android.modules.utils.build.SdkLevel
 import com.android.permissioncontroller.Constants
 import com.android.permissioncontroller.Constants.KEY_LAST_NOTIFICATION_LISTENER_NOTIFICATION_SHOWN
@@ -1146,7 +1145,7 @@ class NotificationListenerPackageResetHandler : BroadcastReceiver() {
             return
         }
 
-        val data = Preconditions.checkNotNull(intent.data)
+        val data = requireNotNull(intent.data)
         val pkg: String = data.schemeSpecificPart
 
         if (DEBUG) Log.i(TAG, "Reset $pkg")
diff --git a/PermissionController/tests/mocking/src/com/android/permissioncontroller/tests/mocking/privacysources/NotificationListenerCheckInternalTest.kt b/PermissionController/tests/mocking/src/com/android/permissioncontroller/tests/mocking/privacysources/NotificationListenerCheckInternalTest.kt
index bc00d3bc8..4bb021b3d 100644
--- a/PermissionController/tests/mocking/src/com/android/permissioncontroller/tests/mocking/privacysources/NotificationListenerCheckInternalTest.kt
+++ b/PermissionController/tests/mocking/src/com/android/permissioncontroller/tests/mocking/privacysources/NotificationListenerCheckInternalTest.kt
@@ -30,7 +30,6 @@ import android.safetycenter.SafetyCenterManager
 import android.safetycenter.SafetyEvent
 import android.safetycenter.SafetySourceData
 import android.safetycenter.SafetySourceIssue
-import androidx.core.util.Preconditions
 import androidx.test.core.app.ApplicationProvider
 import androidx.test.ext.junit.runners.AndroidJUnit4
 import androidx.test.filters.SdkSuppress
@@ -464,9 +463,7 @@ class NotificationListenerCheckInternalTest {
         }
 
         val safetySourceIssue =
-            Preconditions.checkNotNull(
-                notificationListenerCheck.createSafetySourceIssue(testComponent, 0)
-            )
+            checkNotNull(notificationListenerCheck.createSafetySourceIssue(testComponent, 0))
 
         val expectedId = "notification_listener_${testComponent.flattenToString()}"
         val expectedTitle =