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

Commit 09424ead authored by Jeff DeCew's avatar Jeff DeCew
Browse files

Correct the resource type annotation on Icon.getResId() 

Test: n/a
Fixes: 176106341
Change-Id: Id473e728ad6ce43eff8105c6817a5d52137bc5e9
parent c7c4e4a7

core/api/current.txt

+1 −1
Original line number Diff line number Diff line
@@ -16241,7 +16241,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);