summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--api/system-current.txt8
-rw-r--r--graphics/java/android/graphics/drawable/Icon.java3
2 files changed, 10 insertions, 1 deletions
diff --git a/api/system-current.txt b/api/system-current.txt
index cb0fe3f88d08..65e34f7c4ff6 100644
--- a/api/system-current.txt
+++ b/api/system-current.txt
@@ -1266,6 +1266,14 @@ package android.content.pm.permission {
}
+package android.graphics.drawable {
+
+ public final class Icon implements android.os.Parcelable {
+ method public static android.graphics.drawable.Icon createWithResource(android.content.res.Resources, int);
+ }
+
+}
+
package android.hardware {
public final class Sensor {
diff --git a/graphics/java/android/graphics/drawable/Icon.java b/graphics/java/android/graphics/drawable/Icon.java
index accc08157ac5..a33777314116 100644
--- a/graphics/java/android/graphics/drawable/Icon.java
+++ b/graphics/java/android/graphics/drawable/Icon.java
@@ -21,6 +21,7 @@ import android.annotation.DrawableRes;
import android.annotation.IdRes;
import android.annotation.IntDef;
import android.annotation.NonNull;
+import android.annotation.SystemApi;
import android.annotation.UnsupportedAppUsage;
import android.content.ContentResolver;
import android.content.Context;
@@ -568,7 +569,7 @@ public final class Icon implements Parcelable {
* Version of createWithResource that takes Resources. Do not use.
* @hide
*/
- @UnsupportedAppUsage
+ @SystemApi
public static Icon createWithResource(Resources res, @DrawableRes int resId) {
if (res == null) {
throw new IllegalArgumentException("Resource must not be null.");