Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "[MediaProjection] Avoid SysUI crash by handling NameNotFoundException" into udc-dev

Browse Source
This commit is contained in:
Yalan Yiue
2023-04-21 14:38:03 +00:00
committed by Android (Google) Code Review
parent a6db0df58d e5a3c1f181
commit 6a3a7bde34
2 changed files with 19 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
packages/SystemUI/src/com/android/systemui/mediaprojection/appselector/data/RecentTaskLabelLoader.kt
View File

@@ -20,6 +20,7 @@ import android.annotation.UserIdInt
import android.content.ComponentName import android.content.ComponentName
import android.content.pm.PackageManager import android.content.pm.PackageManager
import android.os.UserHandle import android.os.UserHandle
import android.util.Log
import com.android.systemui.dagger.qualifiers.Background import com.android.systemui.dagger.qualifiers.Background
import javax.inject.Inject import javax.inject.Inject
import kotlinx.coroutines.CoroutineDispatcher import kotlinx.coroutines.CoroutineDispatcher
@@ -36,18 +37,27 @@ constructor(
private val packageManager: PackageManager private val packageManager: PackageManager
) : RecentTaskLabelLoader { ) : RecentTaskLabelLoader {
private val TAG = "RecentTaskLabelLoader"
override suspend fun loadLabel( override suspend fun loadLabel(
@UserIdInt userId: Int, @UserIdInt userId: Int,
componentName: ComponentName componentName: ComponentName
): CharSequence? = ): CharSequence? =
withContext(coroutineDispatcher) { withContext(coroutineDispatcher) {
val userHandle = UserHandle(userId) var badgedLabel: CharSequence? = null
try {
val appInfo = val appInfo =
packageManager.getApplicationInfo( packageManager.getApplicationInfoAsUser(
componentName.packageName, componentName.packageName,
PackageManager.ApplicationInfoFlags.of(0 /* no flags */) PackageManager.ApplicationInfoFlags.of(0 /* no flags */),
userId
) )
val label = packageManager.getApplicationLabel(appInfo) val label = packageManager.getApplicationLabel(appInfo)
return@withContext packageManager.getUserBadgedLabel(label, userHandle) val userHandle = UserHandle(userId)
badgedLabel = packageManager.getUserBadgedLabel(label, userHandle)
} catch (e: PackageManager.NameNotFoundException) {
Log.e(TAG, "Unable to get application info", e)
}
return@withContext badgedLabel
} }
} }

2
packages/SystemUI/src/com/android/systemui/mediaprojection/appselector/view/RecentTaskViewHolder.kt
View File

@@ -68,7 +68,7 @@ constructor(
} }
launch { launch {
val label = labelLoader.loadLabel(task.userId, component) val label = labelLoader.loadLabel(task.userId, component)
root.contentDescription = label root.contentDescription = label ?: root.context.getString(R.string.unknown)
} }
} }
launch { launch {