Snap for 8721292 from 4ad09b9b9ecc2e7f906b9c2de2f473c7c04f3f60 to tm-release (b45f6093) · Commits · e / os / android_frameworks_base

core/java/android/hardware/camera2/CameraCharacteristics.java

+53 −22

Original line number	Diff line number	Diff line
		@@ -2356,10 +2356,11 @@ public final class CameraCharacteristics extends CameraMetadata<CameraCharacteri
		* <p>A subset of the available request keys that can be overridden for
		* physical devices backing a logical multi-camera.</p>
		* <p>This is a subset of android.request.availableRequestKeys which contains a list
		* of keys that can be overridden using {@link CaptureRequest.Builder#setPhysicalCameraKey }.
		* of keys that can be overridden using
		* {@link android.hardware.camera2.CaptureRequest.Builder#setPhysicalCameraKey }.
		* The respective value of such request key can be obtained by calling
		* {@link CaptureRequest.Builder#getPhysicalCameraKey }. Capture requests that contain
		* individual physical device requests must be built via
		* {@link android.hardware.camera2.CaptureRequest.Builder#getPhysicalCameraKey }.
		* Capture requests that contain individual physical device requests must be built via
		* {@link android.hardware.camera2.CameraDevice#createCaptureRequest(int, Set)}.</p>
		* <p><b>Optional</b> - The value for this key may be {@code null} on some devices.</p>
		* <p><b>Limited capability</b> -
		@@ -2759,7 +2760,7 @@ public final class CameraCharacteristics extends CameraMetadata<CameraCharacteri
		* </table>
		* <p>For applications targeting SDK version 31 or newer, if the mobile device declares to be
		* media performance class 12 or higher by setting
		* {@link android.os.Build.VERSION_CODES.MEDIA_PERFORMANCE_CLASS } to be 31 or larger,
		* {@link android.os.Build.VERSION#MEDIA_PERFORMANCE_CLASS } to be 31 or larger,
		* the primary camera devices (first rear/front camera in the camera ID list) will not
		* support JPEG sizes smaller than 1080p. If the application configures a JPEG stream
		* smaller than 1080p, the camera device will round up the JPEG image size to at least
		@@ -2833,7 +2834,7 @@ public final class CameraCharacteristics extends CameraMetadata<CameraCharacteri
		* </table>
		* <p>For applications targeting SDK version 31 or newer, if the mobile device doesn't declare
		* to be media performance class 12 or better by setting
		* {@link android.os.Build.VERSION_CODES.MEDIA_PERFORMANCE_CLASS } to be 31 or larger,
		* {@link android.os.Build.VERSION#MEDIA_PERFORMANCE_CLASS } to be 31 or larger,
		* or if the camera device isn't a primary rear/front camera, the minimum required output
		* stream configurations are the same as for applications targeting SDK version older than
		* 31.</p>
		@@ -2958,9 +2959,27 @@ public final class CameraCharacteristics extends CameraMetadata<CameraCharacteri
		* can provide.</p>
		* <p>Please reference the documentation for the image data destination to
		* check if it limits the maximum size for image data.</p>
		* <p>The following table describes the minimum required output stream
		* configurations based on the hardware level
		* ({@link CameraCharacteristics#INFO_SUPPORTED_HARDWARE_LEVEL android.info.supportedHardwareLevel}):</p>
		* <p>For applications targeting SDK version older than 31, the following table
		* describes the minimum required output stream configurations based on the
		* hardware level ({@link CameraCharacteristics#INFO_SUPPORTED_HARDWARE_LEVEL android.info.supportedHardwareLevel}):
		* Format \| Size \| Hardware Level \| Notes
		* :-------------------------------------------------:\|:--------------------------------------------:\|:--------------:\|:--------------:
		* {@link android.graphics.ImageFormat#JPEG } \| {@link CameraCharacteristics#SENSOR_INFO_ACTIVE_ARRAY_SIZE android.sensor.info.activeArraySize} (*1) \| Any \|
		* {@link android.graphics.ImageFormat#JPEG } \| 1920x1080 (1080p) \| Any \| if 1080p <= activeArraySize
		* {@link android.graphics.ImageFormat#JPEG } \| 1280x720 (720p) \| Any \| if 720p <= activeArraySize
		* {@link android.graphics.ImageFormat#JPEG } \| 640x480 (480p) \| Any \| if 480p <= activeArraySize
		* {@link android.graphics.ImageFormat#JPEG } \| 320x240 (240p) \| Any \| if 240p <= activeArraySize
		* {@link android.graphics.ImageFormat#YUV_420_888 } \| all output sizes available for JPEG \| FULL \|
		* {@link android.graphics.ImageFormat#YUV_420_888 } \| all output sizes available for JPEG, up to the maximum video size \| LIMITED \|
		* {@link android.graphics.ImageFormat#PRIVATE } \| same as YUV_420_888 \| Any \|</p>
		* <p>For applications targeting SDK version 31 or newer, if the mobile device declares to be
		* media performance class 12 or higher by setting
		* {@link android.os.Build.VERSION#MEDIA_PERFORMANCE_CLASS } to be 31 or larger,
		* the primary camera devices (first rear/front camera in the camera ID list) will not
		* support JPEG sizes smaller than 1080p. If the application configures a JPEG stream
		* smaller than 1080p, the camera device will round up the JPEG image size to at least
		* 1080p. The requirements for IMPLEMENTATION_DEFINED and YUV_420_888 stay the same.
		* This new minimum required output stream configurations are illustrated by the table below:</p>
		* <table>
		* <thead>
		* <tr>
		@@ -2984,32 +3003,38 @@ public final class CameraCharacteristics extends CameraMetadata<CameraCharacteri
		* <td align="center">if 1080p <= activeArraySize</td>
		* </tr>
		* <tr>
		* <td align="center">{@link android.graphics.ImageFormat#JPEG }</td>
		* <td align="center">1280x720 (720p)</td>
		* <td align="center">Any</td>
		* <td align="center">{@link android.graphics.ImageFormat#YUV_420_888 }</td>
		* <td align="center">{@link CameraCharacteristics#SENSOR_INFO_ACTIVE_ARRAY_SIZE android.sensor.info.activeArraySize}</td>
		* <td align="center">FULL</td>
		* <td align="center"></td>
		* </tr>
		* <tr>
		* <td align="center">{@link android.graphics.ImageFormat#YUV_420_888 }</td>
		* <td align="center">1920x1080 (1080p)</td>
		* <td align="center">FULL</td>
		* <td align="center">if 1080p <= activeArraySize</td>
		* </tr>
		* <tr>
		* <td align="center">{@link android.graphics.ImageFormat#YUV_420_888 }</td>
		* <td align="center">1280x720 (720)</td>
		* <td align="center">FULL</td>
		* <td align="center">if 720p <= activeArraySize</td>
		* </tr>
		* <tr>
		* <td align="center">{@link android.graphics.ImageFormat#JPEG }</td>
		* <td align="center">{@link android.graphics.ImageFormat#YUV_420_888 }</td>
		* <td align="center">640x480 (480p)</td>
		* <td align="center">Any</td>
		* <td align="center">FULL</td>
		* <td align="center">if 480p <= activeArraySize</td>
		* </tr>
		* <tr>
		* <td align="center">{@link android.graphics.ImageFormat#JPEG }</td>
		* <td align="center">320x240 (240p)</td>
		* <td align="center">Any</td>
		* <td align="center">if 240p <= activeArraySize</td>
		* </tr>
		* <tr>
		* <td align="center">{@link android.graphics.ImageFormat#YUV_420_888 }</td>
		* <td align="center">all output sizes available for JPEG</td>
		* <td align="center">320x240 (240p)</td>
		* <td align="center">FULL</td>
		* <td align="center"></td>
		* <td align="center">if 240p <= activeArraySize</td>
		* </tr>
		* <tr>
		* <td align="center">{@link android.graphics.ImageFormat#YUV_420_888 }</td>
		* <td align="center">all output sizes available for JPEG, up to the maximum video size</td>
		* <td align="center">all output sizes available for FULL hardware level, up to the maximum video size</td>
		* <td align="center">LIMITED</td>
		* <td align="center"></td>
		* </tr>
		@@ -3021,6 +3046,12 @@ public final class CameraCharacteristics extends CameraMetadata<CameraCharacteri
		* </tr>
		* </tbody>
		* </table>
		* <p>For applications targeting SDK version 31 or newer, if the mobile device doesn't declare
		* to be media performance class 12 or better by setting
		* {@link android.os.Build.VERSION#MEDIA_PERFORMANCE_CLASS } to be 31 or larger,
		* or if the camera device isn't a primary rear/front camera, the minimum required output
		* stream configurations are the same as for applications targeting SDK version older than
		* 31.</p>
		* <p>Refer to {@link CameraCharacteristics#REQUEST_AVAILABLE_CAPABILITIES android.request.availableCapabilities} and {@link android.hardware.camera2.CameraDevice#createCaptureSession } for additional mandatory
		* stream configurations on a per-capability basis.</p>
		* <p>*1: For JPEG format, the sizes may be restricted by below conditions:</p>

core/java/android/hardware/camera2/CameraExtensionCharacteristics.java

+2 −2

Original line number	Diff line number	Diff line
		@@ -854,7 +854,7 @@ public final class CameraExtensionCharacteristics {
		Class<CaptureRequest.Key<?>> crKeyTyped = (Class<CaptureRequest.Key<?>>) crKey;

		ret.addAll(requestChars.getAvailableKeyList(CaptureRequest.class, crKeyTyped,
		requestKeys, /includeSynthetic/ false));
		requestKeys, /includeSynthetic/ true));
		}

		// Jpeg quality and orientation must always be supported
		@@ -929,7 +929,7 @@ public final class CameraExtensionCharacteristics {
		Class<CaptureResult.Key<?>> crKeyTyped = (Class<CaptureResult.Key<?>>)crKey;

		ret.addAll(resultChars.getAvailableKeyList(CaptureResult.class, crKeyTyped,
		resultKeys, /includeSynthetic/ false));
		resultKeys, /includeSynthetic/ true));

		// Jpeg quality, orientation and sensor timestamp must always be supported
		if (!ret.contains(CaptureResult.JPEG_QUALITY)) {

core/java/android/os/BaseBundle.java

+25 −1

Original line number	Diff line number	Diff line
		@@ -31,6 +31,7 @@ import com.android.internal.annotations.VisibleForTesting;
		import com.android.internal.util.IndentingPrintWriter;

		import java.io.Serializable;
		import java.lang.ref.WeakReference;
		import java.util.ArrayList;
		import java.util.Set;
		import java.util.function.BiFunction;
		@@ -112,6 +113,19 @@ public class BaseBundle {
		*/
		private boolean mParcelledByNative;

		/*
		* Flag indicating if mParcelledData is only referenced in this bundle.
		* mParcelledData could be referenced by other bundles if mMap contains lazy values,
		* and bundle data is copied to another bundle using putAll or the copy constructors.
		*/
		boolean mOwnsLazyValues = true;

		/*
		* As mParcelledData is set to null when it is unparcelled, we keep a weak reference to
		* it to aid in recycling it. Do not use this reference otherwise.
		*/
		private WeakReference<Parcel> mWeakParcelledData = null;

		/**
		* The ClassLoader used when unparcelling data from mParcelledData.
		*/
		@@ -200,6 +214,9 @@ public class BaseBundle {
		mClassLoader = from.mClassLoader;

		if (from.mMap != null) {
		mOwnsLazyValues = false;
		from.mOwnsLazyValues = false;

		if (!deep) {
		mMap = new ArrayMap<>(from.mMap);
		} else {
		@@ -434,6 +451,9 @@ public class BaseBundle {
		mMap = map;
		if (recycleParcel) {
		recycleParcel(parcelledData);
		mWeakParcelledData = null;
		} else {
		mWeakParcelledData = new WeakReference<>(parcelledData);
		}
		mParcelledByNative = false;
		mParcelledData = null;
		@@ -575,6 +595,10 @@ public class BaseBundle {
		*/
		public void clear() {
		unparcel();
		if (mOwnsLazyValues && mWeakParcelledData != null) {
		recycleParcel(mWeakParcelledData.get());
		mWeakParcelledData = null;
		}
		mMap.clear();
		}

core/java/android/os/Bundle.java

+2 −0

Original line number	Diff line number	Diff line
		@@ -301,6 +301,8 @@ public final class Bundle extends BaseBundle implements Cloneable, Parcelable {
		public void putAll(Bundle bundle) {
		unparcel();
		bundle.unparcel();
		mOwnsLazyValues = false;
		bundle.mOwnsLazyValues = false;
		mMap.putAll(bundle.mMap);

		// FD state is now known if and only if both bundles already knew

core/java/android/view/SurfaceView.java

+37 −1

Original line number	Diff line number	Diff line
		@@ -41,11 +41,13 @@ import android.os.Handler;
		import android.os.IBinder;
		import android.os.Looper;
		import android.os.SystemClock;
		import android.util.ArraySet;
		import android.util.AttributeSet;
		import android.util.Log;
		import android.view.SurfaceControl.Transaction;
		import android.view.accessibility.AccessibilityNodeInfo;
		import android.view.accessibility.IAccessibilityEmbeddedConnection;
		import android.window.SurfaceSyncer;

		import com.android.internal.view.SurfaceCallbackHelper;

		@@ -204,6 +206,9 @@ public class SurfaceView extends View implements ViewRootImpl.SurfaceChangedCall

		private int mSurfaceFlags = SurfaceControl.HIDDEN;

		private final SurfaceSyncer mSurfaceSyncer = new SurfaceSyncer();
		private final ArraySet<Integer> mSyncIds = new ArraySet<>();

		/**
		* Transaction that should be used from the render thread. This transaction is only thread safe
		* with other calls directly from the render thread.
		@@ -1018,7 +1023,7 @@ public class SurfaceView extends View implements ViewRootImpl.SurfaceChangedCall
		if (shouldSyncBuffer) {
		handleSyncBufferCallback(callbacks, syncBufferTransactionCallback);
		} else {
		redrawNeededAsync(callbacks, this::onDrawFinished);
		handleSyncNoBuffer(callbacks);
		}
		}
		}
		@@ -1061,7 +1066,23 @@ public class SurfaceView extends View implements ViewRootImpl.SurfaceChangedCall
		syncBufferCallback.onBufferReady(t);
		onDrawFinished();
		}));
		}

		private void handleSyncNoBuffer(SurfaceHolder.Callback[] callbacks) {
		final int syncId = mSurfaceSyncer.setupSync(this::onDrawFinished);

		mSurfaceSyncer.addToSync(syncId, syncBufferCallback -> redrawNeededAsync(callbacks,
		() -> {
		syncBufferCallback.onBufferReady(null);
		synchronized (mSyncIds) {
		mSyncIds.remove(syncId);
		}
		}));

		mSurfaceSyncer.markSyncReady(syncId);
		synchronized (mSyncIds) {
		mSyncIds.add(syncId);
		}
		}

		private void redrawNeededAsync(SurfaceHolder.Callback[] callbacks,
		@@ -1070,6 +1091,21 @@ public class SurfaceView extends View implements ViewRootImpl.SurfaceChangedCall
		sch.dispatchSurfaceRedrawNeededAsync(mSurfaceHolder, callbacks);
		}

		/**
		* @hide
		*/
		@Override
		public void surfaceSyncStarted() {
		ViewRootImpl viewRoot = getViewRootImpl();
		if (viewRoot != null) {
		synchronized (mSyncIds) {
		for (int syncId : mSyncIds) {
		viewRoot.mergeSync(syncId, mSurfaceSyncer);
		}
		}
		}
		}

		private static class SyncBufferTransactionCallback {
		private final CountDownLatch mCountDownLatch = new CountDownLatch(1);
		private Transaction mTransaction;