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

Commit 03214b81 authored Apr 28, 2017 by Felipe Leme Committed by android-build-merger Apr 28, 2017

Merge "Changed HtmlInfo.getAttributes() to return List instead of ArrayList"...

Merge "Changed HtmlInfo.getAttributes() to return List instead of ArrayList" into oc-dev am: 3dfd8275
am: 7c453986

Change-Id: I5398a804be6f6674a0371fe319ba8789bd72e7f0

parents 633463af 7c453986

api/current.txt

+1 −1

Original line number	Diff line number	Diff line
		@@ -46547,7 +46547,7 @@ package android.view {

		public static abstract class ViewStructure.HtmlInfo {
		ctor public ViewStructure.HtmlInfo();
		method public abstract java.util.ArrayList<android.util.Pair<java.lang.String, java.lang.String>> getAttributes();
		method public abstract java.util.List<android.util.Pair<java.lang.String, java.lang.String>> getAttributes();
		method public abstract java.lang.String getTag();
		}

api/system-current.txt

+1 −1

Original line number	Diff line number	Diff line
		@@ -50133,7 +50133,7 @@ package android.view {

		public static abstract class ViewStructure.HtmlInfo {
		ctor public ViewStructure.HtmlInfo();
		method public abstract java.util.ArrayList<android.util.Pair<java.lang.String, java.lang.String>> getAttributes();
		method public abstract java.util.List<android.util.Pair<java.lang.String, java.lang.String>> getAttributes();
		method public abstract java.lang.String getTag();
		}

api/test-current.txt

+1 −1

Original line number	Diff line number	Diff line
		@@ -46938,7 +46938,7 @@ package android.view {

		public static abstract class ViewStructure.HtmlInfo {
		ctor public ViewStructure.HtmlInfo();
		method public abstract java.util.ArrayList<android.util.Pair<java.lang.String, java.lang.String>> getAttributes();
		method public abstract java.util.List<android.util.Pair<java.lang.String, java.lang.String>> getAttributes();
		method public abstract java.lang.String getTag();
		}

core/java/android/app/assist/AssistStructure.java

+2 −1

Original line number	Diff line number	Diff line
		@@ -34,6 +34,7 @@ import android.view.autofill.AutofillValue;

		import java.util.ArrayList;
		import java.util.Arrays;
		import java.util.List;

		/**
		* Assist data automatically created by the platform's implementation of Assist and Autofill.
		@@ -1791,7 +1792,7 @@ public class AssistStructure implements Parcelable {
		}

		@Override
		public ArrayList<Pair<String, String>> getAttributes() {
		public List<Pair<String, String>> getAttributes() {
		if (mAttributes == null && mNames != null) {
		mAttributes = new ArrayList<>(mNames.length);
		for (int i = 0; i < mNames.length; i++) {

core/java/android/view/ViewStructure.java

+2 −2

Original line number	Diff line number	Diff line
		@@ -26,7 +26,7 @@ import android.util.Pair;
		import android.view.autofill.AutofillId;
		import android.view.autofill.AutofillValue;

		import java.util.ArrayList;
		import java.util.List;

		/**
		* Container for storing additional per-view data generated by {@link View#onProvideStructure
		@@ -429,7 +429,7 @@ public abstract class ViewStructure {
		* @return list of key/value pairs; could contain pairs with the same keys.
		*/
		@Nullable
		public abstract ArrayList<Pair<String, String>> getAttributes();
		public abstract List<Pair<String, String>> getAttributes();

		/**
		* Builder for {@link HtmlInfo} objects.