Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 8c59be26 authored by Jeff DeCew's avatar Jeff DeCew Committed by Android (Google) Code Review
Browse files

Merge "Correct the resource type annotation on Icon.getResId()"

parents 7365a931 09424ead

core/api/current.txt

+1 −1
Original line number Diff line number Diff line
@@ -16244,7 +16244,7 @@ package android.graphics.drawable { 
    method public static android.graphics.drawable.Icon createWithResource(android.content.Context, @DrawableRes int);

    method public static android.graphics.drawable.Icon createWithResource(String, @DrawableRes int);

    method public int describeContents();

    method @IdRes public int getResId();

    method @DrawableRes public int getResId();

    method @NonNull public String getResPackage();

    method public int getType();

    method @NonNull public android.net.Uri getUri();

graphics/java/android/graphics/drawable/Icon.java

+1 −2
Original line number Diff line number Diff line
@@ -21,7 +21,6 @@ import static android.content.Context.CONTEXT_RESTRICTED; 


import android.annotation.ColorInt;

import android.annotation.DrawableRes;

import android.annotation.IdRes;

import android.annotation.IntDef;

import android.annotation.NonNull;

import android.compat.annotation.UnsupportedAppUsage;
@@ -248,7 +247,7 @@ public final class Icon implements Parcelable { 
     * Note: This resource may not be available if the application changes at all, and it is

     * up to the caller to ensure safety if this resource is re-used and/or persisted.

     */

    @IdRes

    @DrawableRes

    public int getResId() {

        if (mType != TYPE_RESOURCE) {

            throw new IllegalStateException("called getResId() on " + this);