From 34d214e9ae6e0d41dc2f092e51963a66ca17f83e Mon Sep 17 00:00:00 2001
From: Julian Winkler <julian.winkler1@web.de>
Date: Tue, 22 Aug 2023 13:24:31 +0200
Subject: [PATCH] AssetManager.java: fill indices array when loading TypedArray

This is needed for TypedArray.getIndexCount() and related functions
---
 .../android/content/res/AssetManager.java     | 23 ++++++++++++-------
 1 file changed, 15 insertions(+), 8 deletions(-)

diff --git a/src/api-impl/android/content/res/AssetManager.java b/src/api-impl/android/content/res/AssetManager.java
index e4513762..12c19a53 100644
--- a/src/api-impl/android/content/res/AssetManager.java
+++ b/src/api-impl/android/content/res/AssetManager.java
@@ -878,6 +878,7 @@ public final class AssetManager {
 		Map<Integer,ValueItem> defStyle = loadStyle(defStyleRes);
 
 		ResXmlPullParser parser = (ResXmlPullParser)set;
+		outIndices[0] = 0;
 
 		for (int i = 0; i < inAttrs.length; i++) {
 			int d = i*AssetManager.STYLE_NUM_ENTRIES;
@@ -923,17 +924,22 @@ public final class AssetManager {
 			if (valueItem == null)
 				continue;
 			if (valueItem.getValueType() == ValueType.REFERENCE) {
-				resId = valueItem.getData();
-				if (resId == 0)
-					continue;
-				entry = tableBlockSearch(resId).pickOne();
+				while (valueItem.getValueType() == ValueType.REFERENCE) {
+					resId = valueItem.getData();
+					valueItem = null;
+					if (resId == 0)
+						break;
+					valueItem = tableBlockSearch(resId).pickOne().getResValue();
+					if (valueItem == null)
+						break;
+				}
 
 				outValues[d + AssetManager.STYLE_RESOURCE_ID] = resId;
-				ResValue resValue = entry.getResValue();
-				if (resValue != null) {
-					outValues[d + AssetManager.STYLE_TYPE] = entry.getResValue().getType();
-					outValues[d + AssetManager.STYLE_DATA] = entry.getResValue().getData();
+				if (valueItem != null) {
+					outValues[d + AssetManager.STYLE_TYPE] = valueItem.getType();
+					outValues[d + AssetManager.STYLE_DATA] = valueItem.getData();
 					outValues[d + AssetManager.STYLE_ASSET_COOKIE] = getCookie(valueItem);
+					outIndices[++outIndices[0]] = i;
 				} else {
 					outValues[d + AssetManager.STYLE_TYPE] = -1;
 					outValues[d + AssetManager.STYLE_ASSET_COOKIE] = -1;
@@ -943,6 +949,7 @@ public final class AssetManager {
 				outValues[d+AssetManager.STYLE_TYPE] = valueItem.getType();
 				outValues[d+AssetManager.STYLE_DATA] = valueItem.getData();
 				outValues[d+AssetManager.STYLE_ASSET_COOKIE] = getCookie(valueItem);
+				outIndices[++outIndices[0]] = i;
 			}
 		}
 		return true;