diff options
| author | Hongwei Wang <hwwang@google.com> | 2020-10-28 19:38:11 +0000 |
|---|---|---|
| committer | Hongwei Wang <hwwang@google.com> | 2020-10-28 20:16:22 +0000 |
| commit | 050275cd83f4a66dc3705714ccbe8db025626ce8 (patch) | |
| tree | 9c941a44b9f1ba83bbd13fe25716c94727a06035 /rs/java/android/renderscript/Font.java | |
| parent | 72f07d6a8a32db4a0dedd7682a0b3385be2b9cd6 (diff) | |
Revert "Add maxTargetSdk restriction to unused APIs."
This reverts commit 72f07d6a8a32db4a0dedd7682a0b3385be2b9cd6.
Reason for revert: Droidcop-triggered revert due to breakage https://android-build.googleplex.com/builds/quarterdeck?testMethod=testAppZygotePreload&testClass=android.app.cts.ServiceTest&atpConfigName=suite%2Ftest-mapping-presubmit-retry_cloud-tf&testModule=CtsAppTestCases&fkbb=6936597&lkbb=6936969&lkgb=6936551&testResults=true&branch=git_master&target=cf_x86_phone-userdebug>, bug b/171886397
Bug: 171886397
Change-Id: Ibe0f0430a3451477c1ee8ef56a596e91ea1e7672
Diffstat (limited to 'rs/java/android/renderscript/Font.java')
| -rw-r--r-- | rs/java/android/renderscript/Font.java | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/rs/java/android/renderscript/Font.java b/rs/java/android/renderscript/Font.java index e47ec4b31700..df9d8019f28d 100644 --- a/rs/java/android/renderscript/Font.java +++ b/rs/java/android/renderscript/Font.java @@ -19,7 +19,6 @@ 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; @@ -238,7 +237,7 @@ public class Font extends BaseObj { * * Returns default font if no match could be found. */ - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @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(); |