Merge remote-tracking branch 'origin/lineage-20.0' into v1-t (6d927621) · Commits · e / os / android_frameworks_base

core/java/android/app/NotificationHistory.java

+4 −0

Original line number	Diff line number	Diff line
		@@ -256,6 +256,10 @@ public final class NotificationHistory implements Parcelable {
		mParcel.setDataPosition(0);
		mParcel.appendFrom(data, data.dataPosition(), listByteLength);
		mParcel.setDataSize(mParcel.dataPosition());
		if (positionInParcel > mParcel.dataSize()) {
		throw new IllegalStateException(
		"Obtained an invalid position value(" + positionInParcel + " from Parcel.");
		}
		mParcel.setDataPosition(positionInParcel);
		}
		}

+8 −2

Original line number	Diff line number	Diff line
		@@ -441,10 +441,16 @@ public class CustomTile extends QSTileImpl<State> implements TileChangeListener
		} catch (Exception e) {
		Log.w(TAG, "Invalid icon, forcing into unavailable state");
		state.state = Tile.STATE_UNAVAILABLE;
		drawable = mDefaultIcon.loadDrawable(mUserContext);
		}

		final Drawable drawableF = drawable;
		final Drawable drawableF;
		if (drawable != null) {
		drawableF = drawable;
		} else if (mDefaultIcon != null) {
		drawableF = mDefaultIcon.loadDrawable(mUserContext);
		} else {
		drawableF = null;
		}
		state.iconSupplier = () -> {
		if (drawableF == null) return null;
		Drawable.ConstantState cs = drawableF.getConstantState();