commit 70ca32bca24d388f219ee2bf600737801fe10184
author Colin Cross <ccross@android.com> Wed Aug 09 16:25:07 2023 -0700
committer Cherrypicker Worker <android-build-cherrypicker-worker@google.com> Mon Sep 11 20:35:47 2023 +0000
tree 236a272e50edd1f2f6f2feb6cbc1c31c0890a76d
parent e892df24ca3de29297ceacc700657e1cd1bece19

Fix kotlin nullable errors in Launcher3

Fix kotlin nullable errors that were exposed by setting the retention
of android.annotation.NonNull and android.annotation.Nullable to
class retention.

This relands I26edfec35dca14abe90b08e3c74de0446eda95d2 with a fix in
SplitSelectDataHolder.kt to call createPackageContext when user is null
instead of asserting that it is not null.

Bug: 294110802
Test: builds
Test: WMShellFlickerServiceTests
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:4cc251e6c1bd5e06ef24a92e08aae043cf3f2587)
Merged-In: I4525d0fa83a1db9cc5cff90f340fc3f863537c01
Change-Id: I4525d0fa83a1db9cc5cff90f340fc3f863537c01

quickstep/src/com/android/quickstep/util/SplitSelectDataHolder.kt

diff --git a/quickstep/src/com/android/quickstep/util/SplitSelectDataHolder.kt b/quickstep/src/com/android/quickstep/util/SplitSelectDataHolder.kt
index f32e9bc..3ff461a 100644
--- a/quickstep/src/com/android/quickstep/util/SplitSelectDataHolder.kt
+++ b/quickstep/src/com/android/quickstep/util/SplitSelectDataHolder.kt
@@ -159,7 +159,7 @@
         secondUser = pendingIntent.creatorUserHandle
     }
 
-    private fun getShortcutInfo(intent: Intent?, user: UserHandle): ShortcutInfo? {
+    private fun getShortcutInfo(intent: Intent?, user: UserHandle?): ShortcutInfo? {
         val intentPackage = intent?.getPackage()
         if (intentPackage == null) {
             return null
@@ -167,8 +167,12 @@
         val shortcutId = intent.getStringExtra(ShortcutKey.EXTRA_SHORTCUT_ID)
                 ?: return null
         try {
-            val context: Context = context.createPackageContextAsUser(
-                    intentPackage, 0 /* flags */, user)
+            val context: Context =
+                if (user != null) {
+                    context.createPackageContextAsUser(intentPackage, 0 /* flags */, user)
+                } else {
+                    context.createPackageContext(intentPackage, 0 /* *flags */)
+                }
             return ShortcutInfo.Builder(context, shortcutId).build()
         } catch (e: PackageManager.NameNotFoundException) {
             Log.w(TAG, "Failed to create a ShortcutInfo for " + intent.getPackage())