Snap for 9787270 from c82fa1ff239b04b938db0aa64ec197cfdfdfe33b to tm-qpr3-release (85aa92cb) · Commits · e / os / android_frameworks_base

core/java/android/app/TaskInfo.java

+11 −0

Original line number	Diff line number	Diff line
		@@ -187,6 +187,14 @@ public class TaskInfo {
		*/
		public int launchIntoPipHostTaskId;

		/**
		* The task id of the parent Task of the launch-into-pip Activity, i.e., if task have more than
		* one activity it will create new task for this activity, this id is the origin task id and
		* the pip activity will be reparent to origin task when it exit pip mode.
		* @hide
		*/
		public int lastParentTaskIdBeforePip;

		/**
		* The {@link Rect} copied from {@link DisplayCutout#getSafeInsets()} if the cutout is not of
		* (LAYOUT_IN_DISPLAY_CUTOUT_MODE_SHORT_EDGES, LAYOUT_IN_DISPLAY_CUTOUT_MODE_ALWAYS),
		@@ -503,6 +511,7 @@ public class TaskInfo {
		pictureInPictureParams = source.readTypedObject(PictureInPictureParams.CREATOR);
		shouldDockBigOverlays = source.readBoolean();
		launchIntoPipHostTaskId = source.readInt();
		lastParentTaskIdBeforePip = source.readInt();
		displayCutoutInsets = source.readTypedObject(Rect.CREATOR);
		topActivityInfo = source.readTypedObject(ActivityInfo.CREATOR);
		isResizeable = source.readBoolean();
		@@ -549,6 +558,7 @@ public class TaskInfo {
		dest.writeTypedObject(pictureInPictureParams, flags);
		dest.writeBoolean(shouldDockBigOverlays);
		dest.writeInt(launchIntoPipHostTaskId);
		dest.writeInt(lastParentTaskIdBeforePip);
		dest.writeTypedObject(displayCutoutInsets, flags);
		dest.writeTypedObject(topActivityInfo, flags);
		dest.writeBoolean(isResizeable);
		@@ -589,6 +599,7 @@ public class TaskInfo {
		+ " pictureInPictureParams=" + pictureInPictureParams
		+ " shouldDockBigOverlays=" + shouldDockBigOverlays
		+ " launchIntoPipHostTaskId=" + launchIntoPipHostTaskId
		+ " lastParentTaskIdBeforePip=" + lastParentTaskIdBeforePip
		+ " displayCutoutSafeInsets=" + displayCutoutInsets
		+ " topActivityInfo=" + topActivityInfo
		+ " launchCookies=" + launchCookies

core/java/android/hardware/camera2/extension/CameraOutputConfig.aidl

+1 −0

Original line number	Diff line number	Diff line
		@@ -36,4 +36,5 @@ parcelable CameraOutputConfig
		int surfaceGroupId;
		String physicalCameraId;
		List<CameraOutputConfig> sharedSurfaceConfigs;
		boolean isMultiResolutionOutput;
		}

core/java/android/hardware/camera2/impl/CameraAdvancedExtensionSessionImpl.java

+3 −0

Original line number	Diff line number	Diff line
		@@ -226,6 +226,9 @@ public final class CameraAdvancedExtensionSessionImpl extends CameraExtensionSes
		OutputConfiguration cameraOutput = new OutputConfiguration(output.surfaceGroupId,
		outputSurface);

		if (output.isMultiResolutionOutput) {
		cameraOutput.setMultiResolutionOutput();
		}
		if ((output.sharedSurfaceConfigs != null) && !output.sharedSurfaceConfigs.isEmpty()) {
		cameraOutput.enableSurfaceSharing();
		for (CameraOutputConfig sharedOutputConfig : output.sharedSurfaceConfigs) {

core/java/android/hardware/camera2/params/OutputConfiguration.java

+1 −1

Original line number	Diff line number	Diff line
		@@ -421,7 +421,7 @@ public final class OutputConfiguration implements Parcelable {
		* call, or no non-negative group ID has been set.
		* @hide
		*/
		void setMultiResolutionOutput() {
		public void setMultiResolutionOutput() {
		if (mIsShared) {
		throw new IllegalStateException("Multi-resolution output flag must not be set for " +
		"configuration with surface sharing");

core/java/android/os/BatteryStats.java

+9 −0

Original line number	Diff line number	Diff line
		@@ -2807,6 +2807,15 @@ public abstract class BatteryStats implements Parcelable {
		*/
		public abstract long getMobileRadioMeasuredBatteryConsumptionUC();

		/**
		* Returns the battery consumption (in microcoulombs) of the phone calls, derived from on device
		* power measurement data.
		* Will return {@link #POWER_DATA_UNAVAILABLE} if data is unavailable.
		*
		* {@hide}
		*/
		public abstract long getPhoneEnergyConsumptionUC();

		/**
		* Returns the battery consumption (in microcoulombs) of the screen while on, derived from on
		* device power measurement data.