Snap for 4739962 from d5a1bb621a05d414ed630643898f98081893f71b to pi-release (73310acc) · Commits · e / os / android_frameworks_base

apct-tests/perftests/core/src/android/os/BinderCallsStatsPerfTest.java

+0 −1

Original line number	Diff line number	Diff line
		@@ -69,7 +69,6 @@ public class BinderCallsStatsPerfTest {
		final BenchmarkState state = mPerfStatusReporter.getBenchmarkState();
		Binder b = new Binder();
		mBinderCallsStats = new BinderCallsStats(false);
		assertNull(mBinderCallsStats.callStarted(b, 0));
		while (state.keepRunning()) {
		BinderCallsStats.CallSession s = mBinderCallsStats.callStarted(b, 0);
		mBinderCallsStats.callEnded(s);

config/hiddenapi-light-greylist.txt

+49 −1

File changed.

Preview size limit exceeded, changes collapsed.

core/java/android/app/ActivityManager.java

+21 −3

Original line number	Diff line number	Diff line
		@@ -2102,18 +2102,24 @@ public class ActivityManager {
		private final GraphicBuffer mSnapshot;
		private final int mOrientation;
		private final Rect mContentInsets;
		// Whether this snapshot is a down-sampled version of the full resolution, used mainly for
		// low-ram devices
		private final boolean mReducedResolution;
		// Whether or not the snapshot is a real snapshot or an app-theme generated snapshot due to
		// the task having a secure window or having previews disabled
		private final boolean mIsRealSnapshot;
		private final int mWindowingMode;
		private final float mScale;

		public TaskSnapshot(GraphicBuffer snapshot, int orientation, Rect contentInsets,
		boolean reducedResolution, float scale, boolean isRealSnapshot) {
		boolean reducedResolution, float scale, boolean isRealSnapshot, int windowingMode) {
		mSnapshot = snapshot;
		mOrientation = orientation;
		mContentInsets = new Rect(contentInsets);
		mReducedResolution = reducedResolution;
		mScale = scale;
		mIsRealSnapshot = isRealSnapshot;
		mWindowingMode = windowingMode;
		}

		private TaskSnapshot(Parcel source) {
		@@ -2123,6 +2129,7 @@ public class ActivityManager {
		mReducedResolution = source.readBoolean();
		mScale = source.readFloat();
		mIsRealSnapshot = source.readBoolean();
		mWindowingMode = source.readInt();
		}

		/**
		@@ -2162,6 +2169,13 @@ public class ActivityManager {
		return mIsRealSnapshot;
		}

		/**
		* @return The windowing mode of the task when this snapshot was taken.
		*/
		public int getWindowingMode() {
		return mWindowingMode;
		}

		/**
		* @return The scale this snapshot was taken in.
		*/
		@@ -2182,14 +2196,18 @@ public class ActivityManager {
		dest.writeBoolean(mReducedResolution);
		dest.writeFloat(mScale);
		dest.writeBoolean(mIsRealSnapshot);
		dest.writeInt(mWindowingMode);
		}

		@Override
		public String toString() {
		return "TaskSnapshot{mSnapshot=" + mSnapshot + " mOrientation=" + mOrientation
		final int width = mSnapshot != null ? mSnapshot.getWidth() : 0;
		final int height = mSnapshot != null ? mSnapshot.getHeight() : 0;
		return "TaskSnapshot{mSnapshot=" + mSnapshot + " (" + width + "x" + height + ")"
		+ " mOrientation=" + mOrientation
		+ " mContentInsets=" + mContentInsets.toShortString()
		+ " mReducedResolution=" + mReducedResolution + " mScale=" + mScale
		+ " mIsRealSnapshot=" + mIsRealSnapshot;
		+ " mIsRealSnapshot=" + mIsRealSnapshot + " mWindowingMode=" + mWindowingMode;
		}

		public static final Creator<TaskSnapshot> CREATOR = new Creator<TaskSnapshot>() {

core/java/android/provider/Settings.java

+1 −0

Original line number	Diff line number	Diff line
		@@ -10775,6 +10775,7 @@ public final class Settings {
		* track_cpu_active_cluster_time (boolean)
		* read_binary_cpu_time (boolean)
		* proc_state_cpu_times_read_delay_ms (long)
		* external_stats_collection_rate_limit_ms (long)
		* </pre>
		*
		* <p>

core/java/android/text/AndroidBidi.java

+6 −2

Original line number	Diff line number	Diff line
		@@ -32,8 +32,12 @@ import com.android.internal.annotations.VisibleForTesting;
		@VisibleForTesting(visibility = VisibleForTesting.Visibility.PACKAGE)
		public class AndroidBidi {

		private static class EmojiBidiOverride extends BidiClassifier {
		EmojiBidiOverride() {
		/**
		* Overrides ICU {@link BidiClassifier} in order to correctly handle character directions for
		* newest emoji that ICU is not aware of.
		*/
		public static class EmojiBidiOverride extends BidiClassifier {
		public EmojiBidiOverride() {
		super(null /* No persisting object needed */);
		}