Merge "Add nullability to obtainStyledAttributes methods." (317288d5) · Commits · e / os / android_frameworks_base

core/java/android/content/Context.java

+10 −6

Original line number	Diff line number	Diff line
		@@ -691,7 +691,8 @@ public abstract class Context {
		*
		* @see android.content.res.Resources.Theme#obtainStyledAttributes(int[])
		*/
		public final TypedArray obtainStyledAttributes(@StyleableRes int[] attrs) {
		@NonNull
		public final TypedArray obtainStyledAttributes(@NonNull @StyleableRes int[] attrs) {
		return getTheme().obtainStyledAttributes(attrs);
		}

		@@ -702,8 +703,9 @@ public abstract class Context {
		*
		* @see android.content.res.Resources.Theme#obtainStyledAttributes(int, int[])
		*/
		public final TypedArray obtainStyledAttributes(
		@StyleRes int resid, @StyleableRes int[] attrs) throws Resources.NotFoundException {
		@NonNull
		public final TypedArray obtainStyledAttributes(@StyleRes int resid,
		@NonNull @StyleableRes int[] attrs) throws Resources.NotFoundException {
		return getTheme().obtainStyledAttributes(resid, attrs);
		}

		@@ -714,8 +716,9 @@ public abstract class Context {
		*
		* @see android.content.res.Resources.Theme#obtainStyledAttributes(AttributeSet, int[], int, int)
		*/
		@NonNull
		public final TypedArray obtainStyledAttributes(
		AttributeSet set, @StyleableRes int[] attrs) {
		@Nullable AttributeSet set, @NonNull @StyleableRes int[] attrs) {
		return getTheme().obtainStyledAttributes(set, attrs, 0, 0);
		}

		@@ -726,8 +729,9 @@ public abstract class Context {
		*
		* @see android.content.res.Resources.Theme#obtainStyledAttributes(AttributeSet, int[], int, int)
		*/
		public final TypedArray obtainStyledAttributes(
		AttributeSet set, @StyleableRes int[] attrs, @AttrRes int defStyleAttr,
		@NonNull
		public final TypedArray obtainStyledAttributes(@Nullable AttributeSet set,
		@NonNull @StyleableRes int[] attrs, @AttrRes int defStyleAttr,
		@StyleRes int defStyleRes) {
		return getTheme().obtainStyledAttributes(
		set, attrs, defStyleAttr, defStyleRes);

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

+9 −4

Original line number	Diff line number	Diff line
		@@ -1468,7 +1468,8 @@ public class Resources {
		* @see #obtainStyledAttributes(int, int[])
		* @see #obtainStyledAttributes(AttributeSet, int[], int, int)
		*/
		public TypedArray obtainStyledAttributes(@StyleableRes int[] attrs) {
		@NonNull
		public TypedArray obtainStyledAttributes(@NonNull @StyleableRes int[] attrs) {
		return mThemeImpl.obtainStyledAttributes(this, null, attrs, 0, 0);
		}

		@@ -1493,7 +1494,9 @@ public class Resources {
		* @see #obtainStyledAttributes(int[])
		* @see #obtainStyledAttributes(AttributeSet, int[], int, int)
		*/
		public TypedArray obtainStyledAttributes(@StyleRes int resId, @StyleableRes int[] attrs)
		@NonNull
		public TypedArray obtainStyledAttributes(@StyleRes int resId,
		@NonNull @StyleableRes int[] attrs)
		throws NotFoundException {
		return mThemeImpl.obtainStyledAttributes(this, null, attrs, 0, resId);
		}
		@@ -1547,8 +1550,10 @@ public class Resources {
		* @see #obtainStyledAttributes(int[])
		* @see #obtainStyledAttributes(int, int[])
		*/
		public TypedArray obtainStyledAttributes(AttributeSet set,
		@StyleableRes int[] attrs, @AttrRes int defStyleAttr, @StyleRes int defStyleRes) {
		@NonNull
		public TypedArray obtainStyledAttributes(@Nullable AttributeSet set,
		@NonNull @StyleableRes int[] attrs, @AttrRes int defStyleAttr,
		@StyleRes int defStyleRes) {
		return mThemeImpl.obtainStyledAttributes(this, set, attrs, defStyleAttr, defStyleRes);
		}