summaryrefslogtreecommitdiff
path: root/rs/java/android/renderscript/Font.java
diff options
context:
space:
mode:
authorAustin Wang <wangaustin@google.com>2019-12-19 06:38:19 +0000
committerAustin Wang <wangaustin@google.com>2019-12-19 06:38:19 +0000
commita63a2c0130f6adfa6c0bf112021bc61f569d8105 (patch)
treee3c9d96127eb12f39eb8845b1e7d0675fa565d45 /rs/java/android/renderscript/Font.java
parenta5264903e22bc741add895133474ea13a370de4c (diff)
Revert "Use new UnsupportedAppUsage annotation."
This reverts commit a5264903e22bc741add895133474ea13a370de4c. Reason for revert: Droidcop-triggered revert due to breakage https://android-build.googleplex.com/builds/quarterdeck?branch=git_master&target=sdk_phone_armv7-sdk&lkgb=6083299&lkbb=6085371&fkbb=6083313, bug b/146533269 Change-Id: Ie5b031d7b277cf0e09b0a9776b26bf74f5f69e70
Diffstat (limited to 'rs/java/android/renderscript/Font.java')
-rw-r--r--rs/java/android/renderscript/Font.java11
1 files changed, 6 insertions, 5 deletions
diff --git a/rs/java/android/renderscript/Font.java b/rs/java/android/renderscript/Font.java
index df9d8019f28d..583350e91795 100644
--- a/rs/java/android/renderscript/Font.java
+++ b/rs/java/android/renderscript/Font.java
@@ -16,16 +16,17 @@
package android.renderscript;
-import android.compat.annotation.UnsupportedAppUsage;
-import android.content.res.AssetManager;
-import android.content.res.Resources;
-import android.os.Environment;
-
import java.io.File;
import java.io.InputStream;
import java.util.HashMap;
import java.util.Map;
+import android.os.Environment;
+
+import android.annotation.UnsupportedAppUsage;
+import android.content.res.AssetManager;
+import android.content.res.Resources;
+
/**
* @hide
* @deprecated in API 16