Archive/android_translation_layer
0
0
Fork 0
mirror of https://gitlab.com/android_translation_layer/android_translation_layer.git synced 2025-04-28 12:17:57 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

LayerDrawable: handle null Drawables

Browse source 
This fixes a NullPointerException with the SponsorBlock UI of the
Tubular NewPipe fork
This commit is contained in:
Julian Winkler 2025-04-09 12:38:12 +02:00
parent 0b5ab83933
commit 0c0af3d1be
1 changed files with 7 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

10
src/api-impl/android/graphics/drawable/LayerDrawable.java
View file

@ -78,13 +78,17 @@ public class LayerDrawable extends Drawable implements Drawable.Callback {
int length = layers.length; int length = layers.length;
ChildDrawable[] r = new ChildDrawable[length]; ChildDrawable[] r = new ChildDrawable[length];
int j = 0;
for (int i = 0; i < length; i++) { for (int i = 0; i < length; i++) {
r[i] = new ChildDrawable(); if (layers[i] == null)
r[i].mDrawable = layers[i]; continue;
r[j] = new ChildDrawable();
r[j].mDrawable = layers[i];
layers[i].setCallback(this); layers[i].setCallback(this);
mLayerState.mChildrenChangingConfigurations |= layers[i].getChangingConfigurations(); mLayerState.mChildrenChangingConfigurations |= layers[i].getChangingConfigurations();
j++;
} }
mLayerState.mNum = length; mLayerState.mNum = j;
mLayerState.mChildren = r; mLayerState.mChildren = r;
ensurePadding(); ensurePadding();