diff options
| author | Alan Viverette <alanv@google.com> | 2014-09-11 16:33:01 -0700 |
|---|---|---|
| committer | Alan Viverette <alanv@google.com> | 2014-09-11 16:33:01 -0700 |
| commit | 5171dee2152758f307c9a1d70396fa79a921aef5 (patch) | |
| tree | 7858e43f7fd4273ed99b6c6c90abaedd6a5e6034 | |
| parent | d6adcef917aac893fd82e7628781145693d6187f (diff) | |
| download | frameworks_base-5171dee2152758f307c9a1d70396fa79a921aef5.zip frameworks_base-5171dee2152758f307c9a1d70396fa79a921aef5.tar.gz frameworks_base-5171dee2152758f307c9a1d70396fa79a921aef5.tar.bz2 | |
Remove unsafe methods that take TypedArray
BUG: 15782973
Change-Id: Ief4ff69c90c16b0e8c93316af9d46ae9639648fa
| -rw-r--r-- | api/current.txt | 2 | ||||
| -rw-r--r-- | api/removed.txt | 9 | ||||
| -rw-r--r-- | core/java/android/widget/TextView.java | 4 |
3 files changed, 13 insertions, 2 deletions
diff --git a/api/current.txt b/api/current.txt index b6e600b..6671398 100644 --- a/api/current.txt +++ b/api/current.txt @@ -39120,9 +39120,7 @@ package android.widget { method public float getShadowRadius(); method public final boolean getShowSoftInputOnFocus(); method public java.lang.CharSequence getText(); - method public static int getTextColor(android.content.Context, android.content.res.TypedArray, int); method public final android.content.res.ColorStateList getTextColors(); - method public static android.content.res.ColorStateList getTextColors(android.content.Context, android.content.res.TypedArray); method public java.util.Locale getTextLocale(); method public float getTextScaleX(); method public float getTextSize(); diff --git a/api/removed.txt b/api/removed.txt index c8a3b4b..39ae633 100644 --- a/api/removed.txt +++ b/api/removed.txt @@ -65,3 +65,12 @@ package android.view.inputmethod { } +package android.widget { + + public class TextView extends android.view.View implements android.view.ViewTreeObserver.OnPreDrawListener { + method public static int getTextColor(android.content.Context, android.content.res.TypedArray, int); + method public static android.content.res.ColorStateList getTextColors(android.content.Context, android.content.res.TypedArray); + } + +} + diff --git a/core/java/android/widget/TextView.java b/core/java/android/widget/TextView.java index a81ff97..1509e80 100644 --- a/core/java/android/widget/TextView.java +++ b/core/java/android/widget/TextView.java @@ -8178,6 +8178,8 @@ public class TextView extends View implements ViewTreeObserver.OnPreDrawListener * Returns the TextView_textColor attribute from the TypedArray, if set, or * the TextAppearance_textColor from the TextView_textAppearance attribute, * if TextView_textColor was not set directly. + * + * @removed */ public static ColorStateList getTextColors(Context context, TypedArray attrs) { // It's not safe to use this method from apps. The parameter 'attrs' @@ -8205,6 +8207,8 @@ public class TextView extends View implements ViewTreeObserver.OnPreDrawListener * AttributeSet, if set, or the default color from the * TextAppearance_textColor from the TextView_textAppearance attribute, if * TextView_textColor was not set directly. + * + * @removed */ public static int getTextColor(Context context, TypedArray attrs, int def) { final ColorStateList colors = getTextColors(context, attrs); |