Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit f5a8542b authored by android-build-team Robot's avatar android-build-team Robot
Browse files

Snap for 6872792 from 2ca98d20 to rvc-qpr1-release 

Change-Id: I25644071a8361d042aa159f8208369b2fcb1d062
parents e6e9ce7b 2ca98d20

core/java/android/app/ActivityView.java

+2 −13
Original line number Diff line number Diff line
@@ -105,8 +105,7 @@ public class ActivityView extends ViewGroup implements android.window.TaskEmbedd 
    public ActivityView(

            @NonNull Context context, @NonNull AttributeSet attrs, int defStyle,

            boolean singleTaskInstance, boolean usePublicVirtualDisplay) {

        this(context, attrs, defStyle, singleTaskInstance, usePublicVirtualDisplay,

                false /* disableSurfaceViewBackgroundLayer */);

        this(context, attrs, defStyle, singleTaskInstance, usePublicVirtualDisplay, false);

    }



    /** @hide */
@@ -114,22 +113,12 @@ public class ActivityView extends ViewGroup implements android.window.TaskEmbedd 
            @NonNull Context context, @NonNull AttributeSet attrs, int defStyle,

            boolean singleTaskInstance, boolean usePublicVirtualDisplay,

            boolean disableSurfaceViewBackgroundLayer) {

        this(context, attrs, defStyle, singleTaskInstance, usePublicVirtualDisplay,

                disableSurfaceViewBackgroundLayer, false /* useTrustedDisplay */);

    }



    // TODO(b/162901735): Refactor ActivityView with Builder

    /** @hide */

    public ActivityView(

            @NonNull Context context, @NonNull AttributeSet attrs, int defStyle,

            boolean singleTaskInstance, boolean usePublicVirtualDisplay,

            boolean disableSurfaceViewBackgroundLayer, boolean useTrustedDisplay) {

        super(context, attrs, defStyle);

        if (useTaskOrganizer()) {

            mTaskEmbedder = new TaskOrganizerTaskEmbedder(context, this);

        } else {

            mTaskEmbedder = new VirtualDisplayTaskEmbedder(context, this, singleTaskInstance,

                    usePublicVirtualDisplay, useTrustedDisplay);

                    usePublicVirtualDisplay);

        }

        mSurfaceView = new SurfaceView(context, null, 0, 0, disableSurfaceViewBackgroundLayer);

        // Since ActivityView#getAlpha has been overridden, we should use parent class's alpha

core/java/android/hardware/camera2/CaptureRequest.java

+11 −5
Original line number Diff line number Diff line
@@ -2175,10 +2175,8 @@ public final class CaptureRequest extends CameraMetadata<CaptureRequest.Key<?>> 


    /**

     * <p>The desired zoom ratio</p>

     * <p>Instead of using {@link CaptureRequest#SCALER_CROP_REGION android.scaler.cropRegion} with dual purposes of crop and zoom, the

     * application can now choose to use this tag to specify the desired zoom level. The

     * {@link CaptureRequest#SCALER_CROP_REGION android.scaler.cropRegion} can still be used to specify the horizontal or vertical

     * crop to achieve aspect ratios different than the native camera sensor.</p>

     * <p>Instead of using {@link CaptureRequest#SCALER_CROP_REGION android.scaler.cropRegion} for zoom, the application can now choose to

     * use this tag to specify the desired zoom level.</p>

     * <p>By using this control, the application gains a simpler way to control zoom, which can

     * be a combination of optical and digital zoom. For example, a multi-camera system may

     * contain more than one lens with different focal lengths, and the user can use optical
@@ -2860,11 +2858,18 @@ public final class CaptureRequest extends CameraMetadata<CaptureRequest.Key<?>> 
     * respectively.</p>

     * <p>The camera device may adjust the crop region to account for rounding and other hardware

     * requirements; the final crop region used will be included in the output capture result.</p>

     * <p>The camera sensor output aspect ratio depends on factors such as output stream

     * combination and {@link CaptureRequest#CONTROL_AE_TARGET_FPS_RANGE android.control.aeTargetFpsRange}, and shouldn't be adjusted by using

     * this control. And the camera device will treat different camera sensor output sizes

     * (potentially with in-sensor crop) as the same crop of

     * {@link CameraCharacteristics#SENSOR_INFO_ACTIVE_ARRAY_SIZE android.sensor.info.activeArraySize}. As a result, the application shouldn't assume the

     * maximum crop region always maps to the same aspect ratio or field of view for the

     * sensor output.</p>

     * <p>Starting from API level 30, it's strongly recommended to use {@link CaptureRequest#CONTROL_ZOOM_RATIO android.control.zoomRatio}

     * to take advantage of better support for zoom with logical multi-camera. The benefits

     * include better precision with optical-digital zoom combination, and ability to do

     * zoom-out from 1.0x. When using {@link CaptureRequest#CONTROL_ZOOM_RATIO android.control.zoomRatio} for zoom, the crop region in

     * the capture request must be either letterboxing or pillarboxing (but not both). The

     * the capture request should be left as the default activeArray size. The

     * coordinate system is post-zoom, meaning that the activeArraySize or

     * preCorrectionActiveArraySize covers the camera device's field of view "after" zoom.  See

     * {@link CaptureRequest#CONTROL_ZOOM_RATIO android.control.zoomRatio} for details.</p>
@@ -2874,6 +2879,7 @@ public final class CaptureRequest extends CameraMetadata<CaptureRequest.Key<?>> 
     * capability and mode</p>

     * <p>This key is available on all devices.</p>

     *

     * @see CaptureRequest#CONTROL_AE_TARGET_FPS_RANGE

     * @see CaptureRequest#CONTROL_ZOOM_RATIO

     * @see CaptureRequest#DISTORTION_CORRECTION_MODE

     * @see CameraCharacteristics#SCALER_AVAILABLE_MAX_DIGITAL_ZOOM

core/java/android/hardware/camera2/CaptureResult.java

+11 −5
Original line number Diff line number Diff line
@@ -2405,10 +2405,8 @@ public class CaptureResult extends CameraMetadata<CaptureResult.Key<?>> { 


    /**

     * <p>The desired zoom ratio</p>

     * <p>Instead of using {@link CaptureRequest#SCALER_CROP_REGION android.scaler.cropRegion} with dual purposes of crop and zoom, the

     * application can now choose to use this tag to specify the desired zoom level. The

     * {@link CaptureRequest#SCALER_CROP_REGION android.scaler.cropRegion} can still be used to specify the horizontal or vertical

     * crop to achieve aspect ratios different than the native camera sensor.</p>

     * <p>Instead of using {@link CaptureRequest#SCALER_CROP_REGION android.scaler.cropRegion} for zoom, the application can now choose to

     * use this tag to specify the desired zoom level.</p>

     * <p>By using this control, the application gains a simpler way to control zoom, which can

     * be a combination of optical and digital zoom. For example, a multi-camera system may

     * contain more than one lens with different focal lengths, and the user can use optical
@@ -3506,11 +3504,18 @@ public class CaptureResult extends CameraMetadata<CaptureResult.Key<?>> { 
     * respectively.</p>

     * <p>The camera device may adjust the crop region to account for rounding and other hardware

     * requirements; the final crop region used will be included in the output capture result.</p>

     * <p>The camera sensor output aspect ratio depends on factors such as output stream

     * combination and {@link CaptureRequest#CONTROL_AE_TARGET_FPS_RANGE android.control.aeTargetFpsRange}, and shouldn't be adjusted by using

     * this control. And the camera device will treat different camera sensor output sizes

     * (potentially with in-sensor crop) as the same crop of

     * {@link CameraCharacteristics#SENSOR_INFO_ACTIVE_ARRAY_SIZE android.sensor.info.activeArraySize}. As a result, the application shouldn't assume the

     * maximum crop region always maps to the same aspect ratio or field of view for the

     * sensor output.</p>

     * <p>Starting from API level 30, it's strongly recommended to use {@link CaptureRequest#CONTROL_ZOOM_RATIO android.control.zoomRatio}

     * to take advantage of better support for zoom with logical multi-camera. The benefits

     * include better precision with optical-digital zoom combination, and ability to do

     * zoom-out from 1.0x. When using {@link CaptureRequest#CONTROL_ZOOM_RATIO android.control.zoomRatio} for zoom, the crop region in

     * the capture request must be either letterboxing or pillarboxing (but not both). The

     * the capture request should be left as the default activeArray size. The

     * coordinate system is post-zoom, meaning that the activeArraySize or

     * preCorrectionActiveArraySize covers the camera device's field of view "after" zoom.  See

     * {@link CaptureRequest#CONTROL_ZOOM_RATIO android.control.zoomRatio} for details.</p>
@@ -3520,6 +3525,7 @@ public class CaptureResult extends CameraMetadata<CaptureResult.Key<?>> { 
     * capability and mode</p>

     * <p>This key is available on all devices.</p>

     *

     * @see CaptureRequest#CONTROL_AE_TARGET_FPS_RANGE

     * @see CaptureRequest#CONTROL_ZOOM_RATIO

     * @see CaptureRequest#DISTORTION_CORRECTION_MODE

     * @see CameraCharacteristics#SCALER_AVAILABLE_MAX_DIGITAL_ZOOM

core/java/android/window/VirtualDisplayTaskEmbedder.java

+1 −8
Original line number Diff line number Diff line
@@ -19,7 +19,6 @@ package android.window; 
import static android.hardware.display.DisplayManager.VIRTUAL_DISPLAY_FLAG_DESTROY_CONTENT_ON_REMOVAL;

import static android.hardware.display.DisplayManager.VIRTUAL_DISPLAY_FLAG_OWN_CONTENT_ONLY;

import static android.hardware.display.DisplayManager.VIRTUAL_DISPLAY_FLAG_PUBLIC;

import static android.hardware.display.DisplayManager.VIRTUAL_DISPLAY_FLAG_TRUSTED;

import static android.view.Display.INVALID_DISPLAY;



import android.app.ActivityManager;
@@ -64,7 +63,6 @@ public class VirtualDisplayTaskEmbedder extends TaskEmbedder { 
    private int mDisplayDensityDpi;

    private final boolean mSingleTaskInstance;

    private final boolean mUsePublicVirtualDisplay;

    private final boolean mUseTrustedDisplay;

    private VirtualDisplay mVirtualDisplay;

    private Insets mForwardedInsets;

    private DisplayMetrics mTmpDisplayMetrics;
@@ -79,12 +77,10 @@ public class VirtualDisplayTaskEmbedder extends TaskEmbedder { 
     *                           only applicable if virtual displays are used

     */

    public VirtualDisplayTaskEmbedder(Context context, VirtualDisplayTaskEmbedder.Host host,

            boolean singleTaskInstance, boolean usePublicVirtualDisplay,

            boolean useTrustedDisplay) {

            boolean singleTaskInstance, boolean usePublicVirtualDisplay) {

        super(context, host);

        mSingleTaskInstance = singleTaskInstance;

        mUsePublicVirtualDisplay = usePublicVirtualDisplay;

        mUseTrustedDisplay = useTrustedDisplay;

    }



    /**
@@ -107,9 +103,6 @@ public class VirtualDisplayTaskEmbedder extends TaskEmbedder { 
        if (mUsePublicVirtualDisplay) {

            virtualDisplayFlags |= VIRTUAL_DISPLAY_FLAG_PUBLIC;

        }

        if (mUseTrustedDisplay) {

            virtualDisplayFlags |= VIRTUAL_DISPLAY_FLAG_TRUSTED;

        }



        mVirtualDisplay = displayManager.createVirtualDisplay(

                DISPLAY_NAME + "@" + System.identityHashCode(this), mHost.getWidth(),

core/tests/coretests/AndroidManifest.xml

+0 −1
Original line number Diff line number Diff line
@@ -129,7 +129,6 @@ 
    <!-- virtual display test permissions -->

    <uses-permission android:name="android.permission.CAPTURE_VIDEO_OUTPUT" />

    <uses-permission android:name="android.permission.CAPTURE_SECURE_VIDEO_OUTPUT" />

    <uses-permission android:name="android.permission.ADD_TRUSTED_DISPLAY" />



    <!-- color extraction test permissions -->

    <uses-permission android:name="android.permission.READ_FRAME_BUFFER" />