Merge changes I2710cfea,I03fb31ee,Iec512b31 into sc-dev am: 015bca79f4 (b2e1e1c9) · Commits · e / os / android_frameworks_base

core/java/android/content/res/AssetManager.java

+33 −3

Original line number	Diff line number	Diff line
		@@ -43,6 +43,7 @@ import java.io.FileDescriptor;
		import java.io.FileNotFoundException;
		import java.io.IOException;
		import java.io.InputStream;
		import java.lang.ref.Reference;
		import java.util.ArrayList;
		import java.util.Arrays;
		import java.util.Collections;
		@@ -1178,11 +1179,14 @@ public final class AssetManager implements AutoCloseable {

		void releaseTheme(long themePtr) {
		synchronized (this) {
		nativeThemeDestroy(themePtr);
		decRefsLocked(themePtr);
		}
		}

		static long getThemeFreeFunction() {
		return nativeGetThemeFreeFunction();
		}

		void applyStyleToTheme(long themePtr, @StyleRes int resId, boolean force) {
		synchronized (this) {
		// Need to synchronize on AssetManager because we will be accessing
		@@ -1192,6 +1196,31 @@ public final class AssetManager implements AutoCloseable {
		}
		}

		AssetManager rebaseTheme(long themePtr, @NonNull AssetManager newAssetManager,
		@StyleRes int[] styleIds, @StyleRes boolean[] force, int count) {
		// Exchange ownership of the theme with the new asset manager.
		if (this != newAssetManager) {
		synchronized (this) {
		ensureValidLocked();
		decRefsLocked(themePtr);
		}
		synchronized (newAssetManager) {
		newAssetManager.ensureValidLocked();
		newAssetManager.incRefsLocked(themePtr);
		}
		}

		try {
		synchronized (newAssetManager) {
		newAssetManager.ensureValidLocked();
		nativeThemeRebase(newAssetManager.mObject, themePtr, styleIds, force, count);
		}
		} finally {
		Reference.reachabilityFence(newAssetManager);
		}
		return newAssetManager;
		}

		@UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553)
		void setThemeTo(long dstThemePtr, @NonNull AssetManager srcAssetManager, long srcThemePtr) {
		synchronized (this) {
		@@ -1559,12 +1588,13 @@ public final class AssetManager implements AutoCloseable {

		// Theme related native methods
		private static native long nativeThemeCreate(long ptr);
		private static native void nativeThemeDestroy(long themePtr);
		private static native long nativeGetThemeFreeFunction();
		private static native void nativeThemeApplyStyle(long ptr, long themePtr, @StyleRes int resId,
		boolean force);
		private static native void nativeThemeRebase(long ptr, long themePtr, @NonNull int[] styleIds,
		@NonNull boolean[] force, int styleSize);
		private static native void nativeThemeCopy(long dstAssetManagerPtr, long dstThemePtr,
		long srcAssetManagerPtr, long srcThemePtr);
		static native void nativeThemeClear(long themePtr);
		private static native int nativeThemeGetAttributeValue(long ptr, long themePtr,
		@AttrRes int resId, @NonNull TypedValue outValue, boolean resolve);
		private static native void nativeThemeDump(long ptr, long themePtr, int priority, String tag,

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

+9 −9

Original line number	Diff line number	Diff line
		@@ -341,7 +341,7 @@ public class Resources {

		/**
		* Set the underlying implementation (containing all the resources and caches)
		* and updates all Theme references to new implementations as well.
		* and updates all Theme implementations as well.
		* @hide
		*/
		@UnsupportedAppUsage
		@@ -353,14 +353,14 @@ public class Resources {
		mBaseApkAssetsSize = ArrayUtils.size(impl.getAssets().getApkAssets());
		mResourcesImpl = impl;

		// Create new ThemeImpls that are identical to the ones we have.
		// Rebase the ThemeImpls using the new ResourcesImpl.
		synchronized (mThemeRefs) {
		final int count = mThemeRefs.size();
		for (int i = 0; i < count; i++) {
		WeakReference<Theme> weakThemeRef = mThemeRefs.get(i);
		Theme theme = weakThemeRef != null ? weakThemeRef.get() : null;
		if (theme != null) {
		theme.setNewResourcesImpl(mResourcesImpl);
		theme.rebase(mResourcesImpl);
		}
		}
		}
		@@ -1515,12 +1515,6 @@ public class Resources {
		}
		}

		void setNewResourcesImpl(ResourcesImpl resImpl) {
		synchronized (mLock) {
		mThemeImpl = resImpl.newThemeImpl(mThemeImpl.getKey());
		}
		}

		/**
		* Place new attribute values into the theme. The style resource
		* specified by <var>resid</var> will be retrieved from this Theme's
		@@ -1847,6 +1841,12 @@ public class Resources {
		}
		}

		void rebase(ResourcesImpl resImpl) {
		synchronized (mLock) {
		mThemeImpl.rebase(resImpl.mAssets);
		}
		}

		/**
		* Returns the resource ID for the style specified using {@code style="..."} in the
		* {@link AttributeSet}'s backing XML element or {@link Resources#ID_NULL} otherwise if not

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

+18 −17

Original line number	Diff line number	Diff line
		@@ -54,6 +54,8 @@ import android.view.DisplayAdjustments;

		import com.android.internal.util.GrowingArrayUtils;

		import libcore.util.NativeAllocationRegistry;

		import org.xmlpull.v1.XmlPullParser;
		import org.xmlpull.v1.XmlPullParserException;

		@@ -1265,15 +1267,9 @@ public class ResourcesImpl {
		return new ThemeImpl();
		}

		/**
		* Creates a new ThemeImpl which is already set to the given Resources.ThemeKey.
		*/
		ThemeImpl newThemeImpl(Resources.ThemeKey key) {
		ThemeImpl impl = new ThemeImpl();
		impl.mKey.setTo(key);
		impl.rebase();
		return impl;
		}
		private static final NativeAllocationRegistry sThemeRegistry =
		NativeAllocationRegistry.createMalloced(ResourcesImpl.class.getClassLoader(),
		AssetManager.getThemeFreeFunction());

		public class ThemeImpl {
		/**
		@@ -1282,7 +1278,7 @@ public class ResourcesImpl {
		private final Resources.ThemeKey mKey = new Resources.ThemeKey();

		@SuppressWarnings("hiding")
		private final AssetManager mAssets;
		private AssetManager mAssets;
		private final long mTheme;

		/**
		@@ -1293,6 +1289,7 @@ public class ResourcesImpl {
		/package/ ThemeImpl() {
		mAssets = ResourcesImpl.this.mAssets;
		mTheme = mAssets.createTheme();
		sThemeRegistry.registerNativeAllocation(this, mTheme);
		}

		@Override
		@@ -1404,14 +1401,18 @@ public class ResourcesImpl {
		* {@link #applyStyle(int, boolean)}.
		*/
		void rebase() {
		AssetManager.nativeThemeClear(mTheme);

		// Reapply the same styles in the same order.
		for (int i = 0; i < mKey.mCount; i++) {
		final int resId = mKey.mResId[i];
		final boolean force = mKey.mForce[i];
		mAssets.applyStyleToTheme(mTheme, resId, force);
		rebase(mAssets);
		}

		/**
		* Rebases the theme against the {@code newAssets} by re-applying the styles passed to
		* {@link #applyStyle(int, boolean)}.
		*
		* The theme will use {@code newAssets} for all future invocations of
		* {@link #applyStyle(int, boolean)}.
		*/
		void rebase(AssetManager newAssets) {
		mAssets = mAssets.rebaseTheme(mTheme, newAssets, mKey.mResId, mKey.mForce, mKey.mCount);
		}

		/**

core/jni/android_util_AssetManager.cpp

+40 −7

Original line number	Diff line number	Diff line
		@@ -1244,10 +1244,14 @@ static jlong NativeThemeCreate(JNIEnv* /env/, jclass /clazz/, jlong ptr) {
		return reinterpret_cast<jlong>(assetmanager->NewTheme().release());
		}

		static void NativeThemeDestroy(JNIEnv* /env/, jclass /clazz/, jlong theme_ptr) {
		static void NativeThemeDestroy(jlong theme_ptr) {
		delete reinterpret_cast<Theme*>(theme_ptr);
		}

		static jlong NativeGetThemeFreeFunction(JNIEnv* /env/, jclass /clazz/) {
		return static_cast<jlong>(reinterpret_cast<uintptr_t>(&NativeThemeDestroy));
		}

		static void NativeThemeApplyStyle(JNIEnv* env, jclass /clazz/, jlong ptr, jlong theme_ptr,
		jint resid, jboolean force) {
		// AssetManager is accessed via the theme, so grab an explicit lock here.
		@@ -1264,6 +1268,38 @@ static void NativeThemeApplyStyle(JNIEnv* env, jclass /clazz/, jlong ptr, jlon
		// jniThrowException(env, "java/lang/IllegalArgumentException", error_msg.c_str());
		}

		static void NativeThemeRebase(JNIEnv* env, jclass /clazz/, jlong ptr, jlong theme_ptr,
		jintArray style_ids, jbooleanArray force,
		jint style_count) {
		// Lock both the original asset manager of the theme and the new asset manager to be used for the
		// theme.
		ScopedLock<AssetManager2> assetmanager(AssetManagerFromLong(ptr));

		uint32_t* style_id_args = nullptr;
		if (style_ids != nullptr) {
		CHECK(style_count <= env->GetArrayLength(style_ids));
		style_id_args = reinterpret_cast<uint32_t*>(env->GetPrimitiveArrayCritical(style_ids, nullptr));
		if (style_id_args == nullptr) {
		return;
		}
		}

		jboolean* force_args = nullptr;
		if (force != nullptr) {
		CHECK(style_count <= env->GetArrayLength(force));
		force_args = reinterpret_cast<jboolean*>(env->GetPrimitiveArrayCritical(force, nullptr));
		if (force_args == nullptr) {
		env->ReleasePrimitiveArrayCritical(style_ids, style_id_args, JNI_ABORT);
		return;
		}
		}

		auto theme = reinterpret_cast<Theme*>(theme_ptr);
		theme->Rebase(&(*assetmanager), style_id_args, force_args, static_cast<size_t>(style_count));
		env->ReleasePrimitiveArrayCritical(style_ids, style_id_args, JNI_ABORT);
		env->ReleasePrimitiveArrayCritical(force, force_args, JNI_ABORT);
		}

		static void NativeThemeCopy(JNIEnv* env, jclass /clazz/, jlong dst_asset_manager_ptr,
		jlong dst_theme_ptr, jlong src_asset_manager_ptr, jlong src_theme_ptr) {
		Theme* dst_theme = reinterpret_cast<Theme*>(dst_theme_ptr);
		@@ -1284,10 +1320,6 @@ static void NativeThemeCopy(JNIEnv* env, jclass /clazz/, jlong dst_asset_manag
		}
		}

		static void NativeThemeClear(JNIEnv* /env/, jclass /clazz/, jlong theme_ptr) {
		reinterpret_cast<Theme*>(theme_ptr)->Clear();
		}

		static jint NativeThemeGetAttributeValue(JNIEnv* env, jclass /clazz/, jlong ptr, jlong theme_ptr,
		jint resid, jobject typed_value,
		jboolean resolve_references) {
		@@ -1446,10 +1478,11 @@ static const JNINativeMethod gAssetManagerMethods[] = {

		// Theme related methods.
		{"nativeThemeCreate", "(J)J", (void*)NativeThemeCreate},
		{"nativeThemeDestroy", "(J)V", (void*)NativeThemeDestroy},
		{"nativeGetThemeFreeFunction", "()J", (void*)NativeGetThemeFreeFunction},
		{"nativeThemeApplyStyle", "(JJIZ)V", (void*)NativeThemeApplyStyle},
		{"nativeThemeRebase", "(JJ[I[ZI)V", (void*)NativeThemeRebase},

		{"nativeThemeCopy", "(JJJJ)V", (void*)NativeThemeCopy},
		{"nativeThemeClear", "(J)V", (void*)NativeThemeClear},
		{"nativeThemeGetAttributeValue", "(JJILandroid/util/TypedValue;Z)I",
		(void*)NativeThemeGetAttributeValue},
		{"nativeThemeDump", "(JJILjava/lang/String;Ljava/lang/String;)V", (void*)NativeThemeDump},

libs/androidfw/AssetManager2.cpp

+147 −287

File changed.

Preview size limit exceeded, changes collapsed.