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

Commit 1dadfc94 authored Jun 30, 2025 by John Wu Committed by Android (Google) Code Review Jun 30, 2025

Merge "Remove all class load hook initialization" into main

parents 72f230df ba44b0b3

core/java/android/content/res/ApkAssets.java

+0 −2

Original line number	Original line	Diff line number	Diff line
	@@ -22,7 +22,6 @@ import android.compat.annotation.UnsupportedAppUsage;
	import android.content.om.OverlayableInfo;		import android.content.om.OverlayableInfo;
	import android.content.res.loader.AssetsProvider;		import android.content.res.loader.AssetsProvider;
	import android.content.res.loader.ResourcesProvider;		import android.content.res.loader.ResourcesProvider;
	import android.ravenwood.annotation.RavenwoodClassLoadHook;
	import android.ravenwood.annotation.RavenwoodKeepWholeClass;		import android.ravenwood.annotation.RavenwoodKeepWholeClass;
	import android.text.TextUtils;		import android.text.TextUtils;
	import android.util.Log;		import android.util.Log;
	@@ -49,7 +48,6 @@ import java.util.Objects;
	* @hide		* @hide
	*/		*/
	@RavenwoodKeepWholeClass		@RavenwoodKeepWholeClass
	@RavenwoodClassLoadHook(RavenwoodClassLoadHook.LIBANDROID_LOADING_HOOK)
	public final class ApkAssets {		public final class ApkAssets {
	private static final boolean DEBUG = false;		private static final boolean DEBUG = false;

core/java/android/content/res/StringBlock.java

+0 −2

Original line number	Original line	Diff line number	Diff line
	@@ -25,7 +25,6 @@ import android.graphics.Paint;
	import android.graphics.Rect;		import android.graphics.Rect;
	import android.graphics.Typeface;		import android.graphics.Typeface;
	import android.graphics.text.LineBreakConfig;		import android.graphics.text.LineBreakConfig;
	import android.ravenwood.annotation.RavenwoodClassLoadHook;
	import android.ravenwood.annotation.RavenwoodKeepWholeClass;		import android.ravenwood.annotation.RavenwoodKeepWholeClass;
	import android.text.Annotation;		import android.text.Annotation;
	import android.text.Spannable;		import android.text.Spannable;
	@@ -63,7 +62,6 @@ import java.util.Arrays;
	* {@hide}		* {@hide}
	*/		*/
	@RavenwoodKeepWholeClass		@RavenwoodKeepWholeClass
	@RavenwoodClassLoadHook(RavenwoodClassLoadHook.LIBANDROID_LOADING_HOOK)
	public final class StringBlock implements Closeable {		public final class StringBlock implements Closeable {
	private static final String TAG = "AssetManager";		private static final String TAG = "AssetManager";
	private static final boolean localLOGV = false;		private static final boolean localLOGV = false;

core/java/android/content/res/XmlBlock.java

+4 −6

Original line number	Original line	Diff line number	Diff line
	@@ -24,7 +24,6 @@ import android.annotation.NonNull;
	import android.annotation.Nullable;		import android.annotation.Nullable;
	import android.compat.annotation.UnsupportedAppUsage;		import android.compat.annotation.UnsupportedAppUsage;
	import android.os.Build;		import android.os.Build;
	import android.ravenwood.annotation.RavenwoodClassLoadHook;
	import android.ravenwood.annotation.RavenwoodKeepWholeClass;		import android.ravenwood.annotation.RavenwoodKeepWholeClass;
	import android.util.TypedValue;		import android.util.TypedValue;

	@@ -49,7 +48,6 @@ import java.io.Reader;
	*/		*/
	@VisibleForTesting(visibility = VisibleForTesting.Visibility.PACKAGE)		@VisibleForTesting(visibility = VisibleForTesting.Visibility.PACKAGE)
	@RavenwoodKeepWholeClass		@RavenwoodKeepWholeClass
	@RavenwoodClassLoadHook(RavenwoodClassLoadHook.LIBANDROID_LOADING_HOOK)
	public final class XmlBlock implements AutoCloseable {		public final class XmlBlock implements AutoCloseable {
	private static final boolean DEBUG=false;		private static final boolean DEBUG=false;
	public static final String ANDROID_RESOURCES = "http://schemas.android.com/apk/res/android";		public static final String ANDROID_RESOURCES = "http://schemas.android.com/apk/res/android";

core/java/android/os/Binder.java

+0 −2

Original line number	Original line	Diff line number	Diff line
	@@ -21,7 +21,6 @@ import android.annotation.Nullable;
	import android.annotation.SystemApi;		import android.annotation.SystemApi;
	import android.app.AppOpsManager;		import android.app.AppOpsManager;
	import android.compat.annotation.UnsupportedAppUsage;		import android.compat.annotation.UnsupportedAppUsage;
	import android.ravenwood.annotation.RavenwoodClassLoadHook;
	import android.ravenwood.annotation.RavenwoodKeepWholeClass;		import android.ravenwood.annotation.RavenwoodKeepWholeClass;
	import android.util.ExceptionUtils;		import android.util.ExceptionUtils;
	import android.util.Log;		import android.util.Log;
	@@ -82,7 +81,6 @@ import java.util.concurrent.atomic.AtomicReferenceArray;
	* @see IBinder		* @see IBinder
	*/		*/
	@RavenwoodKeepWholeClass		@RavenwoodKeepWholeClass
	@RavenwoodClassLoadHook(RavenwoodClassLoadHook.LIBANDROID_LOADING_HOOK)
	public class Binder implements IBinder {		public class Binder implements IBinder {
	/*		/*
	* Set this flag to true to detect anonymous, local or member classes		* Set this flag to true to detect anonymous, local or member classes

core/java/android/os/Parcel.java

+0 −2

Original line number	Original line	Diff line number	Diff line
	@@ -29,7 +29,6 @@ import android.annotation.TestApi;
	import android.app.AppOpsManager;		import android.app.AppOpsManager;
	import android.compat.annotation.UnsupportedAppUsage;		import android.compat.annotation.UnsupportedAppUsage;
	import android.os.Flags;		import android.os.Flags;
	import android.ravenwood.annotation.RavenwoodClassLoadHook;
	import android.ravenwood.annotation.RavenwoodKeepWholeClass;		import android.ravenwood.annotation.RavenwoodKeepWholeClass;
	import android.ravenwood.annotation.RavenwoodReplace;		import android.ravenwood.annotation.RavenwoodReplace;
	import android.ravenwood.annotation.RavenwoodThrow;		import android.ravenwood.annotation.RavenwoodThrow;
	@@ -240,7 +239,6 @@ import java.util.function.IntFunction;
	* {@link #readSparseArray(ClassLoader, Class)}.		* {@link #readSparseArray(ClassLoader, Class)}.
	*/		*/
	@RavenwoodKeepWholeClass		@RavenwoodKeepWholeClass
	@RavenwoodClassLoadHook(RavenwoodClassLoadHook.LIBANDROID_LOADING_HOOK)
	public final class Parcel {		public final class Parcel {

	private static final boolean DEBUG_RECYCLE = false;		private static final boolean DEBUG_RECYCLE = false;