Snap for 9695862 from 98b21ffca9a4206a6b7401ca5d6a38aacb802fcd to tm-qpr3-release (b6a73c19) · Commits · e / os / android_frameworks_base

core/java/android/service/quicksettings/TileService.java

+1 −1

Original line number	Diff line number	Diff line
		@@ -506,7 +506,7 @@ public class TileService extends Service {
		* the calling package or if the calling user cannot act on behalf of the user from the
		* {@code context}.</li>
		* <li> {@link IllegalArgumentException} if the user of the {@code context} is not the
		* current user.</li>
		* current user. Only thrown for apps targeting {@link Build.VERSION_CODES#TIRAMISU}</li>
		* </ul>
		*/
		public static final void requestListeningState(Context context, ComponentName component) {

core/java/com/android/internal/protolog/BaseProtoLogImpl.java

+10 −2

Original line number	Diff line number	Diff line
		@@ -72,11 +72,13 @@ public class BaseProtoLogImpl {
		private static final String TAG = "ProtoLog";
		private static final long MAGIC_NUMBER_VALUE = ((long) MAGIC_NUMBER_H << 32) \| MAGIC_NUMBER_L;
		static final String PROTOLOG_VERSION = "1.0.0";
		private static final int DEFAULT_PER_CHUNK_SIZE = 0;

		private final File mLogFile;
		private final String mViewerConfigFilename;
		private final TraceBuffer mBuffer;
		protected final ProtoLogViewerConfigReader mViewerConfig;
		private final int mPerChunkSize;

		private boolean mProtoLogEnabled;
		private boolean mProtoLogEnabledLockFree;
		@@ -156,7 +158,7 @@ public class BaseProtoLogImpl {
		return;
		}
		try {
		ProtoOutputStream os = new ProtoOutputStream();
		ProtoOutputStream os = new ProtoOutputStream(mPerChunkSize);
		long token = os.start(LOG);
		os.write(MESSAGE_HASH, messageHash);
		os.write(ELAPSED_REALTIME_NANOS, SystemClock.elapsedRealtimeNanos());
		@@ -215,10 +217,16 @@ public class BaseProtoLogImpl {

		public BaseProtoLogImpl(File file, String viewerConfigFilename, int bufferCapacity,
		ProtoLogViewerConfigReader viewerConfig) {
		this(file, viewerConfigFilename, bufferCapacity, viewerConfig, DEFAULT_PER_CHUNK_SIZE);
		}

		public BaseProtoLogImpl(File file, String viewerConfigFilename, int bufferCapacity,
		ProtoLogViewerConfigReader viewerConfig, int perChunkSize) {
		mLogFile = file;
		mBuffer = new TraceBuffer(bufferCapacity);
		mViewerConfigFilename = viewerConfigFilename;
		mViewerConfig = viewerConfig;
		mPerChunkSize = perChunkSize;
		}

		/**
		@@ -364,7 +372,7 @@ public class BaseProtoLogImpl {
		try {
		long offset =
		(System.currentTimeMillis() - (SystemClock.elapsedRealtimeNanos() / 1000000));
		ProtoOutputStream proto = new ProtoOutputStream();
		ProtoOutputStream proto = new ProtoOutputStream(mPerChunkSize);
		proto.write(MAGIC_NUMBER, MAGIC_NUMBER_VALUE);
		proto.write(VERSION, PROTOLOG_VERSION);
		proto.write(REAL_TIME_TO_ELAPSED_TIME_OFFSET_MILLIS, offset);

core/java/com/android/internal/protolog/ProtoLogImpl.java

+8 −4

Original line number	Diff line number	Diff line
		@@ -30,6 +30,7 @@ public class ProtoLogImpl extends BaseProtoLogImpl {
		private static final int BUFFER_CAPACITY = 1024 * 1024;
		private static final String LOG_FILENAME = "/data/misc/wmtrace/wm_log.winscope";
		private static final String VIEWER_CONFIG_FILENAME = "/system/etc/protolog.conf.json.gz";
		private static final int PER_CHUNK_SIZE = 1024;

		private static ProtoLogImpl sServiceInstance = null;

		@@ -94,7 +95,10 @@ public class ProtoLogImpl extends BaseProtoLogImpl {
		public static synchronized ProtoLogImpl getSingleInstance() {
		if (sServiceInstance == null) {
		sServiceInstance = new ProtoLogImpl(
		new File(LOG_FILENAME), BUFFER_CAPACITY, new ProtoLogViewerConfigReader());
		new File(LOG_FILENAME)
		, BUFFER_CAPACITY
		, new ProtoLogViewerConfigReader()
		, PER_CHUNK_SIZE);
		}
		return sServiceInstance;
		}
		@@ -105,8 +109,8 @@ public class ProtoLogImpl extends BaseProtoLogImpl {
		}

		public ProtoLogImpl(File logFile, int bufferCapacity,
		ProtoLogViewerConfigReader viewConfigReader) {
		super(logFile, VIEWER_CONFIG_FILENAME, bufferCapacity, viewConfigReader);
		ProtoLogViewerConfigReader viewConfigReader, int perChunkSize) {
		super(logFile, VIEWER_CONFIG_FILENAME, bufferCapacity, viewConfigReader, perChunkSize);
		}
		}

libs/WindowManager/Shell/src/com/android/wm/shell/pip/PipContentOverlay.java

+6 −3

Original line number	Diff line number	Diff line
		@@ -39,6 +39,9 @@ import android.window.TaskSnapshot;
		* Represents the content overlay used during the entering PiP animation.
		*/
		public abstract class PipContentOverlay {
		// Fixed string used in WMShellFlickerTests
		protected static final String LAYER_NAME = "PipContentOverlay";

		protected SurfaceControl mLeash;

		/** Attaches the internal {@link #mLeash} to the given parent leash. */
		@@ -86,7 +89,7 @@ public abstract class PipContentOverlay {
		mContext = context;
		mLeash = new SurfaceControl.Builder(new SurfaceSession())
		.setCallsite(TAG)
		.setName(TAG)
		.setName(LAYER_NAME)
		.setColorLayer()
		.build();
		}
		@@ -139,7 +142,7 @@ public abstract class PipContentOverlay {
		mSourceRectHint = new Rect(sourceRectHint);
		mLeash = new SurfaceControl.Builder(new SurfaceSession())
		.setCallsite(TAG)
		.setName(TAG)
		.setName(LAYER_NAME)
		.build();
		}

		@@ -194,7 +197,7 @@ public abstract class PipContentOverlay {
		prepareAppIconOverlay(activityInfo);
		mLeash = new SurfaceControl.Builder(new SurfaceSession())
		.setCallsite(TAG)
		.setName(TAG)
		.setName(LAYER_NAME)
		.build();
		}

libs/WindowManager/Shell/src/com/android/wm/shell/pip/PipTaskOrganizer.java

+1 −1

Original line number	Diff line number	Diff line
		@@ -1594,7 +1594,7 @@ public class PipTaskOrganizer implements ShellTaskOrganizer.TaskListener,
		// source rect hint to enter PiP use bounds animation.
		if (sourceHintRect == null) {
		if (SystemProperties.getBoolean(
		"persist.wm.debug.enable_pip_app_icon_overlay", false)) {
		"persist.wm.debug.enable_pip_app_icon_overlay", true)) {
		animator.setAppIconContentOverlay(
		mContext, currentBounds, mTaskInfo.topActivityInfo);
		} else {