Merge "Revert "Compat-framework on ravenwood"" into main (9fe82166) · Commits · e / os / android_frameworks_base

core/java/android/app/AppCompatCallbacks.java

+0 −1

Original line number	Diff line number	Diff line
		@@ -28,7 +28,6 @@ import java.util.Arrays;
		*
		* @hide
		*/
		@android.ravenwood.annotation.RavenwoodKeepWholeClass
		public final class AppCompatCallbacks implements Compatibility.BehaviorChangeDelegate {
		private final long[] mDisabledChanges;
		private final long[] mLoggableChanges;

+1 −12

Original line number	Diff line number	Diff line
		@@ -29,24 +29,13 @@ import com.android.internal.compat.IPlatformCompat;
		* Handles caching of calls to {@link com.android.internal.compat.IPlatformCompat}
		* @hide
		*/
		@android.ravenwood.annotation.RavenwoodKeepWholeClass
		public final class ChangeIdStateCache
		extends PropertyInvalidatedCache<ChangeIdStateQuery, Boolean> {
		private static final String CACHE_KEY = "cache_key.is_compat_change_enabled";
		private static final int MAX_ENTRIES = 64;
		private static boolean sDisabled = getDefaultDisabled();
		private static boolean sDisabled = false;
		private volatile IPlatformCompat mPlatformCompat;


		@android.ravenwood.annotation.RavenwoodReplace
		private static boolean getDefaultDisabled() {
		return false;
		}

		private static boolean getDefaultDisabled$ravenwood() {
		return true; // TODO(b/376676753) Disable the cache for now.
		}

		/** @hide */
		public ChangeIdStateCache() {
		super(MAX_ENTRIES, CACHE_KEY);

+0 −1

Original line number	Diff line number	Diff line
		@@ -35,7 +35,6 @@ import java.util.Objects;
		* @hide
		*/
		@Immutable
		@android.ravenwood.annotation.RavenwoodKeepWholeClass
		final class ChangeIdStateQuery {

		static final int QUERY_BY_PACKAGE_NAME = 0;

+0 −1

Original line number	Diff line number	Diff line
		@@ -39,7 +39,6 @@ import java.util.Set;
		* @hide
		*/
		@SystemApi
		@android.ravenwood.annotation.RavenwoodKeepWholeClass
		public final class CompatChanges {
		private static final ChangeIdStateCache QUERY_CACHE = new ChangeIdStateCache();

+0 −1

Original line number	Diff line number	Diff line
		@@ -36,7 +36,6 @@ import java.util.Objects;
		* @hide
		*/
		@SystemApi
		@android.ravenwood.annotation.RavenwoodKeepWholeClass
		public final class PackageOverride {

		/** @hide */