Merge "Do the same size-configuration bucketing on both server and client" into sc-dev (1b529aa1) · Commits · e / os / android_frameworks_base

core/java/android/app/ActivityClient.java

+3 −5

Original line number	Diff line number	Diff line
		@@ -25,6 +25,7 @@ import android.os.PersistableBundle;
		import android.os.RemoteException;
		import android.util.Singleton;
		import android.view.RemoteAnimationDefinition;
		import android.window.SizeConfigurationBuckets;

		import com.android.internal.policy.IKeyguardDismissCallback;

		@@ -104,12 +105,9 @@ public class ActivityClient {
		}
		}

		void reportSizeConfigurations(IBinder token, int[] horizontalSizeConfiguration,
		int[] verticalSizeConfigurations, int[] smallestSizeConfigurations) {
		void reportSizeConfigurations(IBinder token, SizeConfigurationBuckets sizeConfigurations) {
		try {
		getActivityClientController().reportSizeConfigurations(token,
		horizontalSizeConfiguration, verticalSizeConfigurations,
		smallestSizeConfigurations);
		getActivityClientController().reportSizeConfigurations(token, sizeConfigurations);
		} catch (RemoteException e) {
		e.rethrowFromSystemServer();
		}

core/java/android/app/ActivityThread.java

+9 −19

Original line number	Diff line number	Diff line
		@@ -158,7 +158,6 @@ import android.util.Pair;
		import android.util.PrintWriterPrinter;
		import android.util.Slog;
		import android.util.SparseArray;
		import android.util.SparseIntArray;
		import android.util.SuperNotCalledException;
		import android.util.UtilConfig;
		import android.util.proto.ProtoOutputStream;
		@@ -180,6 +179,7 @@ import android.view.contentcapture.IContentCaptureManager;
		import android.view.contentcapture.IContentCaptureOptionsCallback;
		import android.view.translation.TranslationSpec;
		import android.webkit.WebView;
		import android.window.SizeConfigurationBuckets;
		import android.window.SplashScreen;
		import android.window.SplashScreenView;

		@@ -604,6 +604,8 @@ public final class ActivityThread extends ClientTransactionHandler
		@LifecycleState
		private int mLifecycleState = PRE_ON_CREATE;

		private SizeConfigurationBuckets mSizeConfigurations;

		@VisibleForTesting
		@UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.P, trackingBug = 115609023)
		public ActivityClientRecord() {
		@@ -3764,23 +3766,8 @@ public final class ActivityThread extends ClientTransactionHandler
		if (configurations == null) {
		return;
		}
		SparseIntArray horizontal = new SparseIntArray();
		SparseIntArray vertical = new SparseIntArray();
		SparseIntArray smallest = new SparseIntArray();
		for (int i = configurations.length - 1; i >= 0; i--) {
		Configuration config = configurations[i];
		if (config.screenHeightDp != Configuration.SCREEN_HEIGHT_DP_UNDEFINED) {
		vertical.put(config.screenHeightDp, 0);
		}
		if (config.screenWidthDp != Configuration.SCREEN_WIDTH_DP_UNDEFINED) {
		horizontal.put(config.screenWidthDp, 0);
		}
		if (config.smallestScreenWidthDp != Configuration.SMALLEST_SCREEN_WIDTH_DP_UNDEFINED) {
		smallest.put(config.smallestScreenWidthDp, 0);
		}
		}
		ActivityClient.getInstance().reportSizeConfigurations(r.token, horizontal.copyKeys(),
		vertical.copyKeys(), smallest.copyKeys());
		r.mSizeConfigurations = new SizeConfigurationBuckets(configurations);
		ActivityClient.getInstance().reportSizeConfigurations(r.token, r.mSizeConfigurations);
		}

		private void deliverNewIntents(ActivityClientRecord r, List<ReferrerIntent> intents) {
		@@ -5773,7 +5760,10 @@ public final class ActivityThread extends ClientTransactionHandler
		// onConfigurationChanged.
		// TODO(b/173090263): Use diff instead after the improvement of AssetManager and
		// ResourcesImpl constructions.
		final int diff = activity.mCurrentConfig.diffPublicOnly(newConfig);
		int diff = activity.mCurrentConfig.diffPublicOnly(newConfig);
		final ActivityClientRecord cr = getActivityClient(activityToken);
		diff = SizeConfigurationBuckets.filterDiff(diff, activity.mCurrentConfig, newConfig,
		cr != null ? cr.mSizeConfigurations : null);

		if (diff == 0) {
		if (!shouldUpdateWindowMetricsBounds(activity.mCurrentConfig, newConfig)

core/java/android/app/IActivityClientController.aidl

+3 −2

Original line number	Diff line number	Diff line
		@@ -25,6 +25,7 @@ import android.content.res.Configuration;
		import android.os.Bundle;
		import android.os.PersistableBundle;
		import android.view.RemoteAnimationDefinition;
		import android.window.SizeConfigurationBuckets;

		import com.android.internal.policy.IKeyguardDismissCallback;

		@@ -49,8 +50,8 @@ interface IActivityClientController {
		oneway void activityDestroyed(in IBinder token);
		oneway void activityRelaunched(in IBinder token);

		oneway void reportSizeConfigurations(in IBinder token, in int[] horizontalSizeConfiguration,
		in int[] verticalSizeConfigurations, in int[] smallestWidthConfigurations);
		oneway void reportSizeConfigurations(in IBinder token,
		in SizeConfigurationBuckets sizeConfigurations);
		boolean moveActivityTaskToBack(in IBinder token, boolean nonRoot);
		boolean shouldUpRecreateTask(in IBinder token, in String destAffinity);
		boolean navigateUpTo(in IBinder token, in Intent target, int resultCode,

core/java/android/window/SizeConfigurationBuckets.aidl

0 → 100644

+19 −0

Original line number	Diff line number	Diff line
		/*
		* Copyright (C) 2021 The Android Open Source Project
		*
		* Licensed under the Apache License, Version 2.0 (the "License");
		* you may not use this file except in compliance with the License.
		* You may obtain a copy of the License at
		*
		* http://www.apache.org/licenses/LICENSE-2.0
		*
		* Unless required by applicable law or agreed to in writing, software
		* distributed under the License is distributed on an "AS IS" BASIS,
		* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
		* See the License for the specific language governing permissions and
		* limitations under the License.
		*/

		package android.window;

		parcelable SizeConfigurationBuckets;

core/java/android/window/SizeConfigurationBuckets.java

0 → 100644

+282 −0

Original line number	Diff line number	Diff line
		/*
		* Copyright (C) 2021 The Android Open Source Project
		*
		* Licensed under the Apache License, Version 2.0 (the "License");
		* you may not use this file except in compliance with the License.
		* You may obtain a copy of the License at
		*
		* http://www.apache.org/licenses/LICENSE-2.0
		*
		* Unless required by applicable law or agreed to in writing, software
		* distributed under the License is distributed on an "AS IS" BASIS,
		* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
		* See the License for the specific language governing permissions and
		* limitations under the License.
		*/

		package android.window;

		import static android.content.pm.ActivityInfo.CONFIG_SCREEN_SIZE;
		import static android.content.pm.ActivityInfo.CONFIG_SMALLEST_SCREEN_SIZE;

		import android.annotation.NonNull;
		import android.annotation.Nullable;
		import android.content.res.Configuration;
		import android.os.Parcelable;
		import android.util.SparseIntArray;

		import com.android.internal.util.DataClass;

		import java.util.Arrays;

		/**
		* Contains size-configuration buckets used to prevent excessive configuration changes during
		* resize.
		*
		* These configurations are collected from application's resources based on size-sensitive
		* qualifiers. For example, layout-w800dp will be added to mHorizontalSizeConfigurations as 800
		* and drawable-sw400dp will be added to both as 400.
		*
		* @hide
		*/
		@DataClass(genAidl = true)
		public final class SizeConfigurationBuckets implements Parcelable {

		/** Horizontal (screenWidthDp) buckets */
		@Nullable
		private final int[] mHorizontal;

		/** Vertical (screenHeightDp) buckets */
		@Nullable
		private final int[] mVertical;

		/** Smallest (smallestScreenWidthDp) buckets */
		@Nullable
		private final int[] mSmallest;

		public SizeConfigurationBuckets(Configuration[] sizeConfigurations) {
		SparseIntArray horizontal = new SparseIntArray();
		SparseIntArray vertical = new SparseIntArray();
		SparseIntArray smallest = new SparseIntArray();
		for (int i = sizeConfigurations.length - 1; i >= 0; i--) {
		Configuration config = sizeConfigurations[i];
		if (config.screenHeightDp != Configuration.SCREEN_HEIGHT_DP_UNDEFINED) {
		vertical.put(config.screenHeightDp, 0);
		}
		if (config.screenWidthDp != Configuration.SCREEN_WIDTH_DP_UNDEFINED) {
		horizontal.put(config.screenWidthDp, 0);
		}
		if (config.smallestScreenWidthDp != Configuration.SMALLEST_SCREEN_WIDTH_DP_UNDEFINED) {
		smallest.put(config.smallestScreenWidthDp, 0);
		}
		}
		mHorizontal = horizontal.copyKeys();
		mVertical = vertical.copyKeys();
		mSmallest = smallest.copyKeys();
		}

		/**
		* Get the changes between two configurations but don't count changes in sizes if they don't
		* cross boundaries that are important to the app.
		*
		* This is a static helper to deal with null `buckets`. When no buckets have been specified,
		* this actually filters out all 3 size-configs. This is legacy behavior.
		*/
		public static int filterDiff(int diff, Configuration oldConfig, Configuration newConfig,
		@Nullable SizeConfigurationBuckets buckets) {
		if (buckets == null) {
		return diff & ~(CONFIG_SCREEN_SIZE \| CONFIG_SMALLEST_SCREEN_SIZE);
		}
		if ((diff & CONFIG_SCREEN_SIZE) != 0) {
		final boolean crosses = buckets.crossesHorizontalSizeThreshold(oldConfig.screenWidthDp,
		newConfig.screenWidthDp)
		\|\| buckets.crossesVerticalSizeThreshold(oldConfig.screenHeightDp,
		newConfig.screenHeightDp);
		if (!crosses) {
		diff &= ~CONFIG_SCREEN_SIZE;
		}
		}
		if ((diff & CONFIG_SMALLEST_SCREEN_SIZE) != 0) {
		final int oldSmallest = oldConfig.smallestScreenWidthDp;
		final int newSmallest = newConfig.smallestScreenWidthDp;
		if (!buckets.crossesSmallestSizeThreshold(oldSmallest, newSmallest)) {
		diff &= ~CONFIG_SMALLEST_SCREEN_SIZE;
		}
		}
		return diff;
		}

		private boolean crossesHorizontalSizeThreshold(int firstDp, int secondDp) {
		return crossesSizeThreshold(mHorizontal, firstDp, secondDp);
		}

		private boolean crossesVerticalSizeThreshold(int firstDp, int secondDp) {
		return crossesSizeThreshold(mVertical, firstDp, secondDp);
		}

		private boolean crossesSmallestSizeThreshold(int firstDp, int secondDp) {
		return crossesSizeThreshold(mSmallest, firstDp, secondDp);
		}

		/**
		* The purpose of this method is to decide whether the activity needs to be relaunched upon
		* changing its size. In most cases the activities don't need to be relaunched, if the resize
		* is small, all the activity content has to do is relayout itself within new bounds. There are
		* cases however, where the activity's content would be completely changed in the new size and
		* the full relaunch is required.
		*
		* The activity will report to us vertical and horizontal thresholds after which a relaunch is
		* required. These thresholds are collected from the application resource qualifiers. For
		* example, if application has layout-w600dp resource directory, then it needs a relaunch when
		* we resize from width of 650dp to 550dp, as it crosses the 600dp threshold. However, if
		* it resizes width from 620dp to 700dp, it won't be relaunched as it stays on the same side
		* of the threshold.
		*/
		private static boolean crossesSizeThreshold(int[] thresholds, int firstDp,
		int secondDp) {
		if (thresholds == null) {
		return false;
		}
		for (int i = thresholds.length - 1; i >= 0; i--) {
		final int threshold = thresholds[i];
		if ((firstDp < threshold && secondDp >= threshold)
		\|\| (firstDp >= threshold && secondDp < threshold)) {
		return true;
		}
		}
		return false;
		}

		@Override
		public String toString() {
		return Arrays.toString(mHorizontal) + " " + Arrays.toString(mVertical) + " "
		+ Arrays.toString(mSmallest);
		}



		// Code below generated by codegen v1.0.22.
		//
		// DO NOT MODIFY!
		// CHECKSTYLE:OFF Generated code
		//
		// To regenerate run:
		// $ codegen $ANDROID_BUILD_TOP/frameworks/base/core/java/android/window/SizeConfigurationBuckets.java
		//
		// To exclude the generated code from IntelliJ auto-formatting enable (one-time):
		// Settings > Editor > Code Style > Formatter Control
		//@formatter:off


		/**
		* Creates a new SizeConfigurationBuckets.
		*
		* @param horizontal
		* Horizontal (screenWidthDp) buckets
		* @param vertical
		* Vertical (screenHeightDp) buckets
		* @param smallest
		* Smallest (smallestScreenWidthDp) buckets
		*/
		@DataClass.Generated.Member
		public SizeConfigurationBuckets(
		@Nullable int[] horizontal,
		@Nullable int[] vertical,
		@Nullable int[] smallest) {
		this.mHorizontal = horizontal;
		this.mVertical = vertical;
		this.mSmallest = smallest;

		// onConstructed(); // You can define this method to get a callback
		}

		/**
		* Horizontal (screenWidthDp) buckets
		*/
		@DataClass.Generated.Member
		public @Nullable int[] getHorizontal() {
		return mHorizontal;
		}

		/**
		* Vertical (screenHeightDp) buckets
		*/
		@DataClass.Generated.Member
		public @Nullable int[] getVertical() {
		return mVertical;
		}

		/**
		* Smallest (smallestScreenWidthDp) buckets
		*/
		@DataClass.Generated.Member
		public @Nullable int[] getSmallest() {
		return mSmallest;
		}

		@Override
		@DataClass.Generated.Member
		public void writeToParcel(@NonNull android.os.Parcel dest, int flags) {
		// You can override field parcelling by defining methods like:
		// void parcelFieldName(Parcel dest, int flags) { ... }

		byte flg = 0;
		if (mHorizontal != null) flg \|= 0x1;
		if (mVertical != null) flg \|= 0x2;
		if (mSmallest != null) flg \|= 0x4;
		dest.writeByte(flg);
		if (mHorizontal != null) dest.writeIntArray(mHorizontal);
		if (mVertical != null) dest.writeIntArray(mVertical);
		if (mSmallest != null) dest.writeIntArray(mSmallest);
		}

		@Override
		@DataClass.Generated.Member
		public int describeContents() { return 0; }

		/** @hide */
		@SuppressWarnings({"unchecked", "RedundantCast"})
		@DataClass.Generated.Member
		/* package-private */ SizeConfigurationBuckets(@NonNull android.os.Parcel in) {
		// You can override field unparcelling by defining methods like:
		// static FieldType unparcelFieldName(Parcel in) { ... }

		byte flg = in.readByte();
		int[] horizontal = (flg & 0x1) == 0 ? null : in.createIntArray();
		int[] vertical = (flg & 0x2) == 0 ? null : in.createIntArray();
		int[] smallest = (flg & 0x4) == 0 ? null : in.createIntArray();

		this.mHorizontal = horizontal;
		this.mVertical = vertical;
		this.mSmallest = smallest;

		// onConstructed(); // You can define this method to get a callback
		}

		@DataClass.Generated.Member
		public static final @NonNull Parcelable.Creator<SizeConfigurationBuckets> CREATOR
		= new Parcelable.Creator<SizeConfigurationBuckets>() {
		@Override
		public SizeConfigurationBuckets[] newArray(int size) {
		return new SizeConfigurationBuckets[size];
		}

		@Override
		public SizeConfigurationBuckets createFromParcel(@NonNull android.os.Parcel in) {
		return new SizeConfigurationBuckets(in);
		}
		};

		@DataClass.Generated(
		time = 1615845864280L,
		codegenVersion = "1.0.22",
		sourceFile = "frameworks/base/core/java/android/window/SizeConfigurationBuckets.java",
		inputSignatures = "private final @android.annotation.Nullable int[] mHorizontal\nprivate final @android.annotation.Nullable int[] mVertical\nprivate final @android.annotation.Nullable int[] mSmallest\npublic static int filterDiff(int,android.content.res.Configuration,android.content.res.Configuration,android.window.SizeConfigurationBuckets)\nprivate boolean crossesHorizontalSizeThreshold(int,int)\nprivate boolean crossesVerticalSizeThreshold(int,int)\nprivate boolean crossesSmallestSizeThreshold(int,int)\nprivate static boolean crossesSizeThreshold(int[],int,int)\npublic @java.lang.Override java.lang.String toString()\nclass SizeConfigurationBuckets extends java.lang.Object implements [android.os.Parcelable]\n@com.android.internal.util.DataClass(genAidl=true)")
		@Deprecated
		private void __metadata() {}


		//@formatter:on
		// End of generated code

		}