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

Merge "Add check for null actions" into rvc-dev am: 4cb4f934be

Browse Source 
Change-Id: Ibc77edbc21b02981bc785edd454abe99278bd5b3
This commit is contained in:
TreeHugger Robot
2020-05-16 02:07:02 +00:00
committed by Automerger Merge Worker
parent e046407ad0 4cb4f934be
commit 798891f485
1 changed files with 9 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
packages/SystemUI/src/com/android/systemui/media/MediaDataManager.kt
View File

@@ -54,7 +54,7 @@ private const val DEFAULT_LUMINOSITY = 0.25f
private const val LUMINOSITY_THRESHOLD = 0.05f private const val LUMINOSITY_THRESHOLD = 0.05f
private const val SATURATION_MULTIPLIER = 0.8f private const val SATURATION_MULTIPLIER = 0.8f
private val LOADING = MediaData(false, 0, null, null, null, null, null, private val LOADING = MediaData(false, 0, null, null, null, null, null,
emptyList(), emptyList(), null, null, null) emptyList(), emptyList(), null, null, null)
/** /**
@@ -191,12 +191,14 @@ class MediaDataManager @Inject constructor(
// TODO: b/153736623 look into creating actions when this isn't a media style notification // TODO: b/153736623 look into creating actions when this isn't a media style notification
val packageContext: Context = sbn.getPackageContext(context) val packageContext: Context = sbn.getPackageContext(context)
for (action in actions) { if (actions != null) {
val mediaAction = MediaAction( for (action in actions) {
action.getIcon().loadDrawable(packageContext), val mediaAction = MediaAction(
action.actionIntent, action.getIcon().loadDrawable(packageContext),
action.title) action.actionIntent,
actionIcons.add(mediaAction) action.title)
actionIcons.add(mediaAction)
}
} }
foregroundExcecutor.execute { foregroundExcecutor.execute {