Replaces BundleUtil with AndroidX bundleOf

Flag: NA
Test: atest IntentResolver-tests-unit
Bug: NA
Change-Id: I0057955079ec164b4ff640a48aeb4dac3f1e6620

2 files changed, 2 insertions, 24 deletions

diff --git a/java/src/com/android/intentresolver/contentpreview/payloadtoggle/domain/cursor/PayloadToggleCursorResolver.kt b/java/src/com/android/intentresolver/contentpreview/payloadtoggle/domain/cursor/PayloadToggleCursorResolver.kt
index 286891d1..3cf2af13 100644
--- a/java/src/com/android/intentresolver/contentpreview/payloadtoggle/domain/cursor/PayloadToggleCursorResolver.kt
+++ b/java/src/com/android/intentresolver/contentpreview/payloadtoggle/domain/cursor/PayloadToggleCursorResolver.kt
@@ -20,9 +20,9 @@ import android.content.ContentResolver
 import android.content.Intent
 import android.net.Uri
 import android.service.chooser.AdditionalContentContract.Columns.URI
+import androidx.core.os.bundleOf
 import com.android.intentresolver.inject.AdditionalContent
 import com.android.intentresolver.inject.ChooserIntent
-import com.android.intentresolver.util.Bundle
 import com.android.intentresolver.util.cursor.CursorView
 import com.android.intentresolver.util.cursor.viewBy
 import com.android.intentresolver.util.withCancellationSignal
@@ -46,7 +46,7 @@ constructor(
                 contentResolver.query(
                     cursorUri,
                     arrayOf(URI),
-                    Bundle { putParcelable(Intent.EXTRA_INTENT, chooserIntent) },
+                    bundleOf(Intent.EXTRA_INTENT to chooserIntent),
                     signal,
                 )
             }
diff --git a/java/src/com/android/intentresolver/util/BundleUtils.kt b/java/src/com/android/intentresolver/util/BundleUtils.kt
deleted file mode 100644
index da06afef..00000000
--- a/java/src/com/android/intentresolver/util/BundleUtils.kt
+++ /dev/null
@@ -1,22 +0,0 @@
-/*
- * Copyright (C) 2024 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.android.intentresolver.util
-
-import android.os.Bundle
-
-/** Shorthand for `Bundle().apply { ... } */
-inline fun Bundle(block: Bundle.() -> Unit): Bundle = Bundle().apply(block)