Make change and version bump to r_aml_300801500 for mainline module file:... (894d58b6) · Commits · e / os / android_frameworks_base

apct-tests/perftests/windowmanager/src/android/wm/RecentsAnimationPerfTest.java

+7 −0

Original line number	Diff line number	Diff line
		@@ -23,6 +23,7 @@ import static androidx.test.platform.app.InstrumentationRegistry.getInstrumentat
		import static org.hamcrest.core.AnyOf.anyOf;
		import static org.hamcrest.core.Is.is;

		import android.app.ActivityManager;
		import android.app.ActivityManager.TaskSnapshot;
		import android.app.ActivityTaskManager;
		import android.app.IActivityTaskManager;
		@@ -121,6 +122,12 @@ public class RecentsAnimationPerfTest extends WindowManagerPerfTestBase {
		@AfterClass
		public static void tearDownClass() {
		sSetUpClassException = null;
		try {
		// Recents activity may stop app switches. Restore the state to avoid affecting
		// the next test.
		ActivityManager.resumeAppSwitches();
		} catch (RemoteException ignored) {
		}
		sUiAutomation.dropShellPermissionIdentity();
		}

apct-tests/perftests/windowmanager/src/android/wm/RelayoutPerfTest.java

+1 −4

Original line number	Diff line number	Diff line
		@@ -88,10 +88,7 @@ public class RelayoutPerfTest extends WindowManagerPerfTestBase {
		public void testRelayout() throws Throwable {
		final Activity activity = mActivityRule.getActivity();
		final ContentView contentView = new ContentView(activity);
		mActivityRule.runOnUiThread(() -> {
		activity.getWindow().addFlags(WindowManager.LayoutParams.FLAG_KEEP_SCREEN_ON);
		activity.setContentView(contentView);
		});
		mActivityRule.runOnUiThread(() -> activity.setContentView(contentView));
		getInstrumentation().waitForIdleSync();

		final RelayoutRunner relayoutRunner = new RelayoutRunner(activity, contentView.getWindow(),

apct-tests/perftests/windowmanager/src/android/wm/WindowManagerPerfTestBase.java

+17 −7

Original line number	Diff line number	Diff line
		@@ -19,11 +19,13 @@ package android.wm;
		import static androidx.test.platform.app.InstrumentationRegistry.getInstrumentation;

		import android.app.Activity;
		import android.app.KeyguardManager;
		import android.app.UiAutomation;
		import android.content.Context;
		import android.content.Intent;
		import android.os.BatteryManager;
		import android.os.ParcelFileDescriptor;
		import android.os.PowerManager;
		import android.perftests.utils.PerfTestActivity;
		import android.provider.Settings;

		@@ -61,25 +63,33 @@ public class WindowManagerPerfTestBase {
		@BeforeClass
		public static void setUpOnce() {
		final Context context = getInstrumentation().getContext();
		sOriginalStayOnWhilePluggedIn = Settings.Global.getInt(context.getContentResolver(),
		final int stayOnWhilePluggedIn = Settings.Global.getInt(context.getContentResolver(),
		Settings.Global.STAY_ON_WHILE_PLUGGED_IN, 0);
		sOriginalStayOnWhilePluggedIn = -1;
		if (stayOnWhilePluggedIn != BatteryManager.BATTERY_PLUGGED_ANY) {
		sOriginalStayOnWhilePluggedIn = stayOnWhilePluggedIn;
		// Keep the device awake during testing.
		setStayOnWhilePluggedIn(BatteryManager.BATTERY_PLUGGED_USB);
		setStayOnWhilePluggedIn(BatteryManager.BATTERY_PLUGGED_ANY);
		}

		if (!BASE_OUT_PATH.exists()) {
		executeShellCommand("mkdir -p " + BASE_OUT_PATH);
		}
		// In order to be closer to the real use case.
		if (!context.getSystemService(PowerManager.class).isInteractive()
		\|\| context.getSystemService(KeyguardManager.class).isKeyguardLocked()) {
		executeShellCommand("input keyevent KEYCODE_WAKEUP");
		executeShellCommand("wm dismiss-keyguard");
		}
		context.startActivity(new Intent(Intent.ACTION_MAIN)
		.addCategory(Intent.CATEGORY_HOME).setFlags(Intent.FLAG_ACTIVITY_NEW_TASK));
		}

		@AfterClass
		public static void tearDownOnce() {
		if (sOriginalStayOnWhilePluggedIn != -1) {
		setStayOnWhilePluggedIn(sOriginalStayOnWhilePluggedIn);
		}
		}

		private static void setStayOnWhilePluggedIn(int value) {
		executeShellCommand(String.format("settings put global %s %d",

apex/blobstore/service/java/com/android/server/blob/BlobAccessMode.java

+9 −1

Original line number	Diff line number	Diff line
		@@ -44,7 +44,7 @@ import java.util.Objects;
		/**
		* Class for representing how a blob can be shared.
		*
		* Note that this class is not thread-safe, callers need to take of synchronizing access.
		* Note that this class is not thread-safe, callers need to take care of synchronizing access.
		*/
		class BlobAccessMode {
		@Retention(RetentionPolicy.SOURCE)
		@@ -127,6 +127,14 @@ class BlobAccessMode {
		return false;
		}

		int getAccessType() {
		return mAccessType;
		}

		int getNumWhitelistedPackages() {
		return mWhitelistedPackages.size();
		}

		void dump(IndentingPrintWriter fout) {
		fout.println("accessType: " + DebugUtils.flagsToString(
		BlobAccessMode.class, "ACCESS_TYPE_", mAccessType));

apex/blobstore/service/java/com/android/server/blob/BlobMetadata.java

+53 −4

Original line number	Diff line number	Diff line
		@@ -54,6 +54,8 @@ import android.util.ArrayMap;
		import android.util.ArraySet;
		import android.util.Slog;
		import android.util.SparseArray;
		import android.util.StatsEvent;
		import android.util.proto.ProtoOutputStream;

		import com.android.internal.annotations.GuardedBy;
		import com.android.internal.annotations.VisibleForTesting;
		@@ -61,6 +63,8 @@ import com.android.internal.util.IndentingPrintWriter;
		import com.android.internal.util.XmlUtils;
		import com.android.server.blob.BlobStoreManagerService.DumpArgs;

		import libcore.io.IoUtils;

		import org.xmlpull.v1.XmlPullParser;
		import org.xmlpull.v1.XmlPullParserException;
		import org.xmlpull.v1.XmlSerializer;
		@@ -349,14 +353,16 @@ class BlobMetadata {
		} catch (ErrnoException e) {
		throw e.rethrowAsIOException();
		}
		synchronized (mMetadataLock) {
		return createRevocableFdLocked(fd, callingPackage);
		try {
		return createRevocableFd(fd, callingPackage);
		} catch (IOException e) {
		IoUtils.closeQuietly(fd);
		throw e;
		}
		}

		@GuardedBy("mMetadataLock")
		@NonNull
		private ParcelFileDescriptor createRevocableFdLocked(FileDescriptor fd,
		private ParcelFileDescriptor createRevocableFd(FileDescriptor fd,
		String callingPackage) throws IOException {
		final RevocableFileDescriptor revocableFd =
		new RevocableFileDescriptor(mContext, fd);
		@@ -410,6 +416,49 @@ class BlobMetadata {
		return true;
		}

		StatsEvent dumpAsStatsEvent(int atomTag) {
		synchronized (mMetadataLock) {
		ProtoOutputStream proto = new ProtoOutputStream();
		// Write Committer data to proto format
		for (int i = 0, size = mCommitters.size(); i < size; ++i) {
		final Committer committer = mCommitters.valueAt(i);
		final long token = proto.start(
		BlobStatsEventProto.BlobCommitterListProto.COMMITTER);
		proto.write(BlobStatsEventProto.BlobCommitterProto.UID, committer.uid);
		proto.write(BlobStatsEventProto.BlobCommitterProto.COMMIT_TIMESTAMP_MILLIS,
		committer.commitTimeMs);
		proto.write(BlobStatsEventProto.BlobCommitterProto.ACCESS_MODE,
		committer.blobAccessMode.getAccessType());
		proto.write(BlobStatsEventProto.BlobCommitterProto.NUM_WHITELISTED_PACKAGE,
		committer.blobAccessMode.getNumWhitelistedPackages());
		proto.end(token);
		}
		final byte[] committersBytes = proto.getBytes();

		proto = new ProtoOutputStream();
		// Write Leasee data to proto format
		for (int i = 0, size = mLeasees.size(); i < size; ++i) {
		final Leasee leasee = mLeasees.valueAt(i);
		final long token = proto.start(BlobStatsEventProto.BlobLeaseeListProto.LEASEE);
		proto.write(BlobStatsEventProto.BlobLeaseeProto.UID, leasee.uid);
		proto.write(BlobStatsEventProto.BlobLeaseeProto.LEASE_EXPIRY_TIMESTAMP_MILLIS,
		leasee.expiryTimeMillis);
		proto.end(token);
		}
		final byte[] leaseesBytes = proto.getBytes();

		// Construct the StatsEvent to represent this Blob
		return StatsEvent.newBuilder()
		.setAtomId(atomTag)
		.writeLong(mBlobId)
		.writeLong(getSize())
		.writeLong(mBlobHandle.getExpiryTimeMillis())
		.writeByteArray(committersBytes)
		.writeByteArray(leaseesBytes)
		.build();
		}
		}

		void dump(IndentingPrintWriter fout, DumpArgs dumpArgs) {
		fout.println("blobHandle:");
		fout.increaseIndent();