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

Commit 91fe37b8 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Revert "Expose the ability to resolve icon as a different app""

parents a127627e 5aa21692

api/system-current.txt

+0 −8
Original line number Diff line number Diff line
@@ -1281,14 +1281,6 @@ 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 {

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

+1 −2
Original line number Diff line number Diff line
@@ -21,7 +21,6 @@ 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;
@@ -570,7 +569,7 @@ public final class Icon implements Parcelable { 
     * Version of createWithResource that takes Resources. Do not use.

     * @hide

     */

    @SystemApi

    @UnsupportedAppUsage

    public static Icon createWithResource(Resources res, @DrawableRes int resId) {

        if (res == null) {

            throw new IllegalArgumentException("Resource must not be null.");