diff options
author | Alan Viverette <alanv@google.com> | 2015-06-04 16:55:56 +0000 |
---|---|---|
committer | Android (Google) Code Review <android-gerrit@google.com> | 2015-06-04 16:55:57 +0000 |
commit | 52999685178656caba37fa0e9055ac26d707bdce (patch) | |
tree | 49ac375bdd16a0a785c0fc7a17a76ed0d229a41c /media | |
parent | 13d6e4b33b1c34c256d62837a0cda55fae578884 (diff) | |
parent | a70d4a90a029910f788c3e7f8715cf3b842b1e2b (diff) | |
download | frameworks_base-52999685178656caba37fa0e9055ac26d707bdce.zip frameworks_base-52999685178656caba37fa0e9055ac26d707bdce.tar.gz frameworks_base-52999685178656caba37fa0e9055ac26d707bdce.tar.bz2 |
Merge "Prevent poorly-extended ParcelableSpans from writing to parcels" into mnc-dev
Diffstat (limited to 'media')
-rw-r--r-- | media/java/android/media/ClosedCaptionRenderer.java | 30 |
1 files changed, 7 insertions, 23 deletions
diff --git a/media/java/android/media/ClosedCaptionRenderer.java b/media/java/android/media/ClosedCaptionRenderer.java index e3680e9..8403c1c 100644 --- a/media/java/android/media/ClosedCaptionRenderer.java +++ b/media/java/android/media/ClosedCaptionRenderer.java @@ -1044,42 +1044,26 @@ class CCParser { } /** - * @hide - * - * MutableBackgroundColorSpan - * - * This is a mutable version of BackgroundSpan to facilitate text - * rendering with edge styles. + * Mutable version of BackgroundSpan to facilitate text rendering with edge + * styles. * + * @hide */ -class MutableBackgroundColorSpan extends CharacterStyle - implements UpdateAppearance, ParcelableSpan { +class MutableBackgroundColorSpan extends CharacterStyle implements UpdateAppearance { private int mColor; public MutableBackgroundColorSpan(int color) { mColor = color; } - public MutableBackgroundColorSpan(Parcel src) { - mColor = src.readInt(); - } + public void setBackgroundColor(int color) { mColor = color; } + public int getBackgroundColor() { return mColor; } - @Override - public int getSpanTypeId() { - return TextUtils.BACKGROUND_COLOR_SPAN; - } - @Override - public int describeContents() { - return 0; - } - @Override - public void writeToParcel(Parcel dest, int flags) { - dest.writeInt(mColor); - } + @Override public void updateDrawState(TextPaint ds) { ds.bgColor = mColor; |