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

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

Merge "Add nullability annotation to Theme#getAttributeResolutionStack"

parents 634b8ec6 6c15bc08

api/current.txt

+1 −1
Original line number Diff line number Diff line
@@ -12335,7 +12335,7 @@ package android.content.res { 
  public final class Resources.Theme {

    method public void applyStyle(int, boolean);

    method public void dump(int, String, String);

    method public int[] getAttributeResolutionStack(@AttrRes int, @StyleRes int, @StyleRes int);

    method @NonNull public int[] getAttributeResolutionStack(@AttrRes int, @StyleRes int, @StyleRes int);

    method public int getChangingConfigurations();

    method public android.graphics.drawable.Drawable getDrawable(@DrawableRes int) throws android.content.res.Resources.NotFoundException;

    method @StyleRes public int getExplicitStyle(@Nullable android.util.AttributeSet);

core/java/android/content/res/Resources.java

+7 −1
Original line number Diff line number Diff line
@@ -1782,10 +1782,16 @@ public class Resources { 
         * @param explicitStyleRes A resource identifier of an explicit style resource.

         * @return ordered list of resource ID that are considered when resolving attribute values.

         */

        @NonNull

        public int[] getAttributeResolutionStack(@AttrRes int defStyleAttr,

                @StyleRes int defStyleRes, @StyleRes int explicitStyleRes) {

            return mThemeImpl.getAttributeResolutionStack(

            int[] stack = mThemeImpl.getAttributeResolutionStack(

                    defStyleAttr, defStyleRes, explicitStyleRes);

            if (stack == null) {

                return new int[0];

            } else {

                return stack;

            }

        }

    }

core/java/android/content/res/ResourcesImpl.java

+1 −0
Original line number Diff line number Diff line
@@ -1507,6 +1507,7 @@ public class ResourcesImpl { 
         * @param explicitStyleRes A resource identifier of an explicit style resource.

         * @return ordered list of resource ID that are considered when resolving attribute values.

         */

        @Nullable

        public int[] getAttributeResolutionStack(@AttrRes int defStyleAttr,

                @StyleRes int defStyleRes, @StyleRes int explicitStyleRes) {

            synchronized (mKey) {