aixan/lawnchair
1
0
Fork 0
mirror of https://github.com/LawnchairLauncher/lawnchair.git synced 2026-03-01 00:06:47 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix kotlin nullable errors in Launcher3

Browse Source 
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
Change-Id: I4525d0fa83a1db9cc5cff90f340fc3f863537c01
Merged-In: I4525d0fa83a1db9cc5cff90f340fc3f863537c01
This commit is contained in:
Colin Cross
2023-08-09 16:25:07 -07:00
parent 5589b9bd39
commit 4cc251e6c1
1 changed files with 7 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
quickstep/src/com/android/quickstep/util/SplitSelectDataHolder.kt
View File

@@ -159,7 +159,7 @@ class SplitSelectDataHolder(
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 @@ class SplitSelectDataHolder(
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())