Snap for 8641798 from 475683bc0a3e4f44627883599be0ad2a31ff155b to tm-qpr1-release (55a5cf38) · Commits · e / os / android_frameworks_base

core/api/test-current.txt

+1 −1

Original line number	Diff line number	Diff line
		@@ -3393,7 +3393,7 @@ package android.window {
		method @NonNull public android.window.WindowContainerTransaction reparentTasks(@Nullable android.window.WindowContainerToken, @Nullable android.window.WindowContainerToken, @Nullable int[], @Nullable int[], boolean);
		method @NonNull public android.window.WindowContainerTransaction scheduleFinishEnterPip(@NonNull android.window.WindowContainerToken, @NonNull android.graphics.Rect);
		method @NonNull public android.window.WindowContainerTransaction setActivityWindowingMode(@NonNull android.window.WindowContainerToken, int);
		method @NonNull public android.window.WindowContainerTransaction setAdjacentRoots(@NonNull android.window.WindowContainerToken, @NonNull android.window.WindowContainerToken, boolean);
		method @NonNull public android.window.WindowContainerTransaction setAdjacentRoots(@NonNull android.window.WindowContainerToken, @NonNull android.window.WindowContainerToken);
		method @NonNull public android.window.WindowContainerTransaction setAdjacentTaskFragments(@NonNull android.os.IBinder, @Nullable android.os.IBinder, @Nullable android.window.WindowContainerTransaction.TaskFragmentAdjacentParams);
		method @NonNull public android.window.WindowContainerTransaction setAppBounds(@NonNull android.window.WindowContainerToken, @NonNull android.graphics.Rect);
		method @NonNull public android.window.WindowContainerTransaction setBounds(@NonNull android.window.WindowContainerToken, @NonNull android.graphics.Rect);

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

+2 −2

Original line number	Diff line number	Diff line
		@@ -15,8 +15,8 @@
		*/
		package android.hardware.camera2.extension;

		import android.hardware.camera2.extension.Size;
		import android.hardware.camera2.extension.OutputConfigId;
		import android.hardware.camera2.extension.Size;
		import android.view.Surface;

		/** @hide */
		@@ -35,5 +35,5 @@ parcelable CameraOutputConfig
		OutputConfigId outputId;
		int surfaceGroupId;
		String physicalCameraId;
		List<OutputConfigId> surfaceSharingOutputConfigs;
		List<CameraOutputConfig> sharedSurfaceConfigs;
		}

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

+46 −48

Original line number	Diff line number	Diff line
		@@ -217,60 +217,30 @@ public final class CameraAdvancedExtensionSessionImpl extends CameraExtensionSes
		CameraSessionConfig sessionConfig = mSessionProcessor.initSession(mCameraDevice.getId(),
		previewSurface, captureSurface);
		List<CameraOutputConfig> outputConfigs = sessionConfig.outputConfigs;
		// map camera output ids to output configurations
		HashMap<Integer, OutputConfiguration> cameraOutputs = new HashMap<>();
		ArrayList<OutputConfiguration> outputList = new ArrayList<>();
		for (CameraOutputConfig output : outputConfigs) {
		OutputConfiguration cameraOutput = null;
		switch(output.type) {
		case CameraOutputConfig.TYPE_SURFACE:
		if (output.surface == null) {
		Log.w(TAG, "Unsupported client output id: " + output.outputId.id +
		", skipping!");
		continue;
		}
		cameraOutput = new OutputConfiguration(output.surfaceGroupId,
		output.surface);
		break;
		case CameraOutputConfig.TYPE_IMAGEREADER:
		if ((output.imageFormat == ImageFormat.UNKNOWN) \|\| (output.size.width <= 0) \|\|
		(output.size.height <= 0)) {
		Log.w(TAG, "Unsupported client output id: " + output.outputId.id +
		", skipping!");
		Surface outputSurface = initializeSurfrace(output);
		if (outputSurface == null) {
		continue;
		}
		ImageReader reader = ImageReader.newInstance(output.size.width,
		output.size.height, output.imageFormat, output.capacity);
		mReaderMap.put(output.outputId.id, reader);
		cameraOutput = new OutputConfiguration(output.surfaceGroupId,
		reader.getSurface());
		break;
		case CameraOutputConfig.TYPE_MULTIRES_IMAGEREADER:
		// Support for multi-resolution outputs to be added in future releases
		default:
		throw new IllegalArgumentException("Unsupported output config type: " +
		output.type);
		}
		cameraOutput.setPhysicalCameraId(output.physicalCameraId);
		cameraOutputs.put(output.outputId.id, cameraOutput);
		}
		OutputConfiguration cameraOutput = new OutputConfiguration(output.surfaceGroupId,
		outputSurface);

		ArrayList<OutputConfiguration> outputList = new ArrayList<>();
		for (CameraOutputConfig output : outputConfigs) {
		if (!cameraOutputs.containsKey(output.outputId.id)) {
		// Shared surface already removed by a previous iteration
		if ((output.sharedSurfaceConfigs != null) && !output.sharedSurfaceConfigs.isEmpty()) {
		cameraOutput.enableSurfaceSharing();
		for (CameraOutputConfig sharedOutputConfig : output.sharedSurfaceConfigs) {
		Surface sharedSurface = initializeSurfrace(sharedOutputConfig);
		if (sharedSurface == null) {
		continue;
		}
		OutputConfiguration outConfig = cameraOutputs.get(output.outputId.id);
		if ((output.surfaceSharingOutputConfigs != null) &&
		!output.surfaceSharingOutputConfigs.isEmpty()) {
		outConfig.enableSurfaceSharing();
		for (OutputConfigId outputId : output.surfaceSharingOutputConfigs) {
		outConfig.addSurface(cameraOutputs.get(outputId.id).getSurface());
		cameraOutputs.remove(outputId.id);
		cameraOutput.addSurface(sharedSurface);
		mCameraConfigMap.put(sharedSurface, sharedOutputConfig);
		}
		}
		outputList.add(outConfig);
		mCameraConfigMap.put(outConfig.getSurface(), output);

		cameraOutput.setPhysicalCameraId(output.physicalCameraId);
		outputList.add(cameraOutput);
		mCameraConfigMap.put(cameraOutput.getSurface(), output);
		}

		SessionConfiguration sessionConfiguration = new SessionConfiguration(
		@@ -995,4 +965,32 @@ public final class CameraAdvancedExtensionSessionImpl extends CameraExtensionSes
		CameraMetadataNative.update(ret.getNativeMetadata(), request.parameters);
		return ret;
		}

		private Surface initializeSurfrace(CameraOutputConfig output) {
		switch(output.type) {
		case CameraOutputConfig.TYPE_SURFACE:
		if (output.surface == null) {
		Log.w(TAG, "Unsupported client output id: " + output.outputId.id +
		", skipping!");
		return null;
		}
		return output.surface;
		case CameraOutputConfig.TYPE_IMAGEREADER:
		if ((output.imageFormat == ImageFormat.UNKNOWN) \|\| (output.size.width <= 0) \|\|
		(output.size.height <= 0)) {
		Log.w(TAG, "Unsupported client output id: " + output.outputId.id +
		", skipping!");
		return null;
		}
		ImageReader reader = ImageReader.newInstance(output.size.width,
		output.size.height, output.imageFormat, output.capacity);
		mReaderMap.put(output.outputId.id, reader);
		return reader.getSurface();
		case CameraOutputConfig.TYPE_MULTIRES_IMAGEREADER:
		// Support for multi-resolution outputs to be added in future releases
		default:
		throw new IllegalArgumentException("Unsupported output config type: " +
		output.type);
		}
		}
		}

core/java/android/hardware/display/DisplayManager.java

+13 −1

Original line number	Diff line number	Diff line
		@@ -108,6 +108,17 @@ public final class DisplayManager {
		public static final String DISPLAY_CATEGORY_PRESENTATION =
		"android.hardware.display.category.PRESENTATION";

		/**
		* Display category: All displays, including disabled displays.
		* <p>
		* This returns all displays, including currently disabled and inaccessible displays.
		*
		* @see #getDisplays(String)
		* @hide
		*/
		public static final String DISPLAY_CATEGORY_ALL_INCLUDING_DISABLED =
		"android.hardware.display.category.ALL_INCLUDING_DISABLED";

		/ @hide /
		@IntDef(prefix = "VIRTUAL_DISPLAY_FLAG_", flag = true, value = {
		VIRTUAL_DISPLAY_FLAG_PUBLIC,
		@@ -552,7 +563,8 @@ public final class DisplayManager {
		final int[] displayIds = mGlobal.getDisplayIds();
		synchronized (mLock) {
		try {
		if (category == null) {
		if (category == null
		\|\| DISPLAY_CATEGORY_ALL_INCLUDING_DISABLED.equals(category)) {
		addAllDisplaysLocked(mTempDisplays, displayIds);
		} else if (category.equals(DISPLAY_CATEGORY_PRESENTATION)) {
		addPresentationDisplaysLocked(mTempDisplays, displayIds, Display.TYPE_WIFI);

core/java/android/service/wallpaper/WallpaperService.java

+3 −2

Original line number	Diff line number	Diff line
		@@ -1536,8 +1536,9 @@ public abstract class WallpaperService extends Service {
		// may have been destroyed so now we need to make
		// sure it is re-created.
		doOffsetsChanged(false);
		// force relayout to get new surface
		updateSurface(true, false, false);
		// It will check mSurfaceCreated so no need to force relayout.
		updateSurface(false /* forceRelayout /, false / forceReport */,
		false /* redrawNeeded */);
		}
		onVisibilityChanged(visible);
		if (mReportedVisible && mFrozenRequested) {