From a74879d25eb0e4ef53855b57181b038bca75d05f Mon Sep 17 00:00:00 2001 From: Bill Peckham Date: Sat, 8 Sep 2018 10:06:40 -0700 Subject: Merge QP1A.180823.001 Change-Id: Ia2d6fa811b3c57185c1975db603d59e6eaef73fc --- rs/java/android/renderscript/Font.java | 3 +++ 1 file changed, 3 insertions(+) (limited to 'rs/java/android/renderscript/Font.java') diff --git a/rs/java/android/renderscript/Font.java b/rs/java/android/renderscript/Font.java index d5ca31e93418..583350e91795 100644 --- a/rs/java/android/renderscript/Font.java +++ b/rs/java/android/renderscript/Font.java @@ -23,6 +23,7 @@ import java.util.Map; import android.os.Environment; +import android.annotation.UnsupportedAppUsage; import android.content.res.AssetManager; import android.content.res.Resources; @@ -85,6 +86,7 @@ public class Font extends BaseObj { /** * @deprecated in API 16 */ + @UnsupportedAppUsage ITALIC, /** * @deprecated in API 16 @@ -236,6 +238,7 @@ public class Font extends BaseObj { * * Returns default font if no match could be found. */ + @UnsupportedAppUsage static public Font create(RenderScript rs, Resources res, String familyName, Style fontStyle, float pointSize) { String fileName = getFontFileName(familyName, fontStyle); String fontPath = Environment.getRootDirectory().getAbsolutePath(); -- cgit v1.2.3