Merge "Add null checks for attribute getters in View." (02318310) · Commits · e / os / android_frameworks_base

core/java/android/view/View.java

+2 −2

Original line number	Diff line number	Diff line
		@@ -5971,7 +5971,7 @@ public class View implements Drawable.Callback, KeyEvent.Callback,
		@NonNull
		public List<Integer> getAttributeResolutionStack(@AttrRes int attribute) {
		ArrayList<Integer> stack = new ArrayList<>();
		if (!sDebugViewAttributes) {
		if (!sDebugViewAttributes \|\| mAttributeResolutionStacks == null) {
		return stack;
		}
		if (mSourceLayoutId != ID_NULL) {
		@@ -6003,7 +6003,7 @@ public class View implements Drawable.Callback, KeyEvent.Callback,
		@NonNull
		public Map<Integer, Integer> getAttributeSourceResourceMap() {
		HashMap<Integer, Integer> map = new HashMap<>();
		if (!sDebugViewAttributes) {
		if (!sDebugViewAttributes \|\| mAttributeSourceResId == null) {
		return map;
		}
		for (int i = 0; i < mAttributeSourceResId.size(); i++) {