Merge "Update EXTENSIONS_VERSION_CURRENT_PLATFORM to 8" into main (48a42998) · Commits · e / os / android_frameworks_base

libs/WindowManager/Jetpack/src/androidx/window/extensions/WindowExtensionsImpl.java

+5 −7

Original line number	Diff line number	Diff line
		@@ -57,9 +57,9 @@ class WindowExtensionsImpl implements WindowExtensions {
		*/
		private static final int NO_LEVEL_OVERRIDE = -1;

		private static final int EXTENSIONS_VERSION_V7 = 7;
		private static final int EXTENSIONS_VERSION_V8 = 8;

		private static final int EXTENSIONS_VERSION_V6 = 6;
		private static final int EXTENSIONS_VERSION_V7 = 7;

		private final Object mLock = new Object();
		private volatile DeviceStateManagerFoldingFeatureProducer mFoldingFeatureProducer;
		@@ -80,12 +80,10 @@ class WindowExtensionsImpl implements WindowExtensions {
		*/
		@VisibleForTesting
		static int getExtensionsVersionCurrentPlatform() {
		if (Flags.activityEmbeddingAnimationCustomizationFlag()) {
		// Activity Embedding animation customization is the only major feature for v7.
		return EXTENSIONS_VERSION_V7;
		} else {
		return EXTENSIONS_VERSION_V6;
		if (Flags.aeBackStackRestore()) {
		return EXTENSIONS_VERSION_V8;
		}
		return EXTENSIONS_VERSION_V7;
		}

		private String generateLogMessage() {