diff options
| author | Scott Lobdell <slobdell@google.com> | 2020-11-05 18:29:12 -0800 |
|---|---|---|
| committer | Scott Lobdell <slobdell@google.com> | 2020-11-13 11:48:49 -0800 |
| commit | 3933f277a025be704e68ea593536e492831a7e05 (patch) | |
| tree | 084aa5e0858c449a63dd18cc57fb21ab054d363a /rs/java/android/renderscript/Font.java | |
| parent | 248a6ce2e2ee65f367b01c43edeecef5a6d57581 (diff) | |
| parent | 9c74513b2d828d5169e9942b58b2f93bb3e04aff (diff) | |
Merge SP1A.201105.002
Change-Id: Iec83a0c1f6f286a1e51abfc4356633ca9d8aea5f
Diffstat (limited to 'rs/java/android/renderscript/Font.java')
| -rw-r--r-- | rs/java/android/renderscript/Font.java | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/rs/java/android/renderscript/Font.java b/rs/java/android/renderscript/Font.java index df9d8019f28d..e47ec4b31700 100644 --- a/rs/java/android/renderscript/Font.java +++ b/rs/java/android/renderscript/Font.java @@ -19,6 +19,7 @@ package android.renderscript; import android.compat.annotation.UnsupportedAppUsage; import android.content.res.AssetManager; import android.content.res.Resources; +import android.os.Build; import android.os.Environment; import java.io.File; @@ -237,7 +238,7 @@ public class Font extends BaseObj { * * Returns default font if no match could be found. */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) static public Font create(RenderScript rs, Resources res, String familyName, Style fontStyle, float pointSize) { String fileName = getFontFileName(familyName, fontStyle); String fontPath = Environment.getRootDirectory().getAbsolutePath(); |