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

Merge "Prevent NPE in CustomTile" into rvc-dev

Browse Source
This commit is contained in:
TreeHugger Robot
2020-02-28 18:01:02 +00:00
committed by Android (Google) Code Review
parent 97ce4799af 2648a2a99a
commit c8bb1b3286
2 changed files with 9 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
packages/SystemUI/src/com/android/systemui/qs/external/CustomTile.java vendored
View File

@@ -327,6 +327,7 @@ public class CustomTile extends QSTileImpl<State> implements TileChangeListener
final Drawable drawableF = drawable; final Drawable drawableF = drawable;
state.iconSupplier = () -> { state.iconSupplier = () -> {
if (drawableF == null) return null;
Drawable.ConstantState cs = drawableF.getConstantState(); Drawable.ConstantState cs = drawableF.getConstantState();
if (cs != null) { if (cs != null) {
return new DrawableIcon(cs.newDrawable()); return new DrawableIcon(cs.newDrawable());

8
packages/SystemUI/tests/src/com/android/systemui/qs/external/CustomTileTest.kt vendored
View File

@@ -125,4 +125,12 @@ class CustomTileTest : SysuiTestCase() {
customTile.handleUpdateState(state, null) customTile.handleUpdateState(state, null)
assertFalse(state.value) assertFalse(state.value)
} }
@Test
fun testNoCrashOnNullDrawable() {
customTile.qsTile.icon = mock(Icon::class.java)
`when`(customTile.qsTile.icon.loadDrawable(any(Context::class.java)))
.thenReturn(null)
customTile.handleUpdateState(customTile.newTileState(), null)
}
} }