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

Commit cd463938 authored by Android Build Coastguard Worker's avatar Android Build Coastguard Worker
Browse files

Snap for 14057448 from 4cbd479a to 25Q4-release 

Change-Id: Iee454f632227c09f0ce8f34e8f9d2e3410517431
parents 1b5e52dd 4cbd479a

core/api/test-current.txt

+8 −6
Original line number Diff line number Diff line
@@ -1329,19 +1329,21 @@ package android.content.res { 
    method public int getDisplayRotationSandbox();

    method public int getRotateAndCropRotation();

    method public static boolean isCameraCompatModeActive(@NonNull android.content.res.CameraCompatibilityInfo);

    method public boolean shouldAllowTransformInverseDisplay();

    method public boolean shouldLetterboxForCameraCompat();

    method public boolean shouldOverrideSensorOrientation();

    method public void writeToParcel(@NonNull android.os.Parcel, int);

    field public static final android.os.Parcelable.Creator<android.content.res.CameraCompatibilityInfo> CREATOR;

    field @NonNull public static final android.os.Parcelable.Creator<android.content.res.CameraCompatibilityInfo> CREATOR;

  }



  public static final class CameraCompatibilityInfo.Builder {

    ctor public CameraCompatibilityInfo.Builder();

    method public android.content.res.CameraCompatibilityInfo build();

    method public android.content.res.CameraCompatibilityInfo.Builder setDisplayRotationSandbox(int);

    method public android.content.res.CameraCompatibilityInfo.Builder setRotateAndCropRotation(int);

    method public android.content.res.CameraCompatibilityInfo.Builder setShouldLetterboxForCameraCompat(boolean);

    method public android.content.res.CameraCompatibilityInfo.Builder setShouldOverrideSensorOrientation(boolean);

    method @NonNull public android.content.res.CameraCompatibilityInfo build();

    method @NonNull public android.content.res.CameraCompatibilityInfo.Builder setDisplayRotationSandbox(int);

    method @NonNull public android.content.res.CameraCompatibilityInfo.Builder setRotateAndCropRotation(int);

    method @NonNull public android.content.res.CameraCompatibilityInfo.Builder setShouldAllowTransformInverseDisplay(boolean);

    method @NonNull public android.content.res.CameraCompatibilityInfo.Builder setShouldLetterboxForCameraCompat(boolean);

    method @NonNull public android.content.res.CameraCompatibilityInfo.Builder setShouldOverrideSensorOrientation(boolean);

  }



  public final class Configuration implements java.lang.Comparable<android.content.res.Configuration> android.os.Parcelable {

core/api/test-lint-baseline.txt

+4 −12
Original line number Diff line number Diff line
@@ -541,18 +541,6 @@ KotlinKeyword: android.app.Notification#when: 


MissingNullability: android.app.AppDetailsActivity#onCreate(android.os.Bundle) parameter #0:

    Missing nullability on parameter `savedInstanceState` in method `onCreate`

MissingNullability: android.content.res.CameraCompatibilityInfo#CREATOR:

    Missing nullability on field `CREATOR` in class `class android.content.res.CameraCompatibilityInfo`

MissingNullability: android.content.res.CameraCompatibilityInfo.Builder#build():

    Missing nullability on method `build` return

MissingNullability: android.content.res.CameraCompatibilityInfo.Builder#setDisplayRotationSandbox(int):

    Missing nullability on method `setDisplayRotationSandbox` return

MissingNullability: android.content.res.CameraCompatibilityInfo.Builder#setRotateAndCropRotation(int):

    Missing nullability on method `setRotateAndCropRotation` return

MissingNullability: android.content.res.CameraCompatibilityInfo.Builder#setShouldLetterboxForCameraCompat(boolean):

    Missing nullability on method `setShouldLetterboxForCameraCompat` return

MissingNullability: android.content.res.CameraCompatibilityInfo.Builder#setShouldOverrideSensorOrientation(boolean):

    Missing nullability on method `setShouldOverrideSensorOrientation` return

MissingNullability: android.hardware.camera2.CameraManager#getRotationOverride(android.content.Context, android.content.pm.PackageManager, String):

    Missing nullability on method `getRotationOverride` return

MissingNullability: android.view.contentcapture.ViewNode.ViewStructureImpl#setHintIdEntry(String) parameter #0:
@@ -2131,6 +2119,8 @@ UnflaggedApi: android.content.res.CameraCompatibilityInfo#getRotateAndCropRotati 
    New API must be flagged with @FlaggedApi: method android.content.res.CameraCompatibilityInfo.getRotateAndCropRotation()

UnflaggedApi: android.content.res.CameraCompatibilityInfo#isCameraCompatModeActive(android.content.res.CameraCompatibilityInfo):

    New API must be flagged with @FlaggedApi: method android.content.res.CameraCompatibilityInfo.isCameraCompatModeActive(android.content.res.CameraCompatibilityInfo)

UnflaggedApi: android.content.res.CameraCompatibilityInfo#shouldAllowTransformInverseDisplay():

    New API must be flagged with @FlaggedApi: method android.content.res.CameraCompatibilityInfo.shouldAllowTransformInverseDisplay()

UnflaggedApi: android.content.res.CameraCompatibilityInfo#shouldLetterboxForCameraCompat():

    New API must be flagged with @FlaggedApi: method android.content.res.CameraCompatibilityInfo.shouldLetterboxForCameraCompat()

UnflaggedApi: android.content.res.CameraCompatibilityInfo#shouldOverrideSensorOrientation():
@@ -2147,6 +2137,8 @@ UnflaggedApi: android.content.res.CameraCompatibilityInfo.Builder#setDisplayRota 
    New API must be flagged with @FlaggedApi: method android.content.res.CameraCompatibilityInfo.Builder.setDisplayRotationSandbox(int)

UnflaggedApi: android.content.res.CameraCompatibilityInfo.Builder#setRotateAndCropRotation(int):

    New API must be flagged with @FlaggedApi: method android.content.res.CameraCompatibilityInfo.Builder.setRotateAndCropRotation(int)

UnflaggedApi: android.content.res.CameraCompatibilityInfo.Builder#setShouldAllowTransformInverseDisplay(boolean):

    New API must be flagged with @FlaggedApi: method android.content.res.CameraCompatibilityInfo.Builder.setShouldAllowTransformInverseDisplay(boolean)

UnflaggedApi: android.content.res.CameraCompatibilityInfo.Builder#setShouldLetterboxForCameraCompat(boolean):

    New API must be flagged with @FlaggedApi: method android.content.res.CameraCompatibilityInfo.Builder.setShouldLetterboxForCameraCompat(boolean)

UnflaggedApi: android.content.res.CameraCompatibilityInfo.Builder#setShouldOverrideSensorOrientation(boolean):

core/java/android/companion/virtual/computercontrol/ComputerControlSession.java

+29 −1
Original line number Diff line number Diff line
@@ -96,6 +96,20 @@ public final class ComputerControlSession implements AutoCloseable { 
    public @interface SessionCreationError {

    }



    /**

     * Computer control action that performs back navigation.

     */

    public static final int ACTION_GO_BACK = 1;



    /** @hide */

    @Retention(RetentionPolicy.SOURCE)

    @IntDef(prefix = "ACTION_", value = {

            ACTION_GO_BACK,

    })

    @Target({ElementType.TYPE_PARAMETER, ElementType.TYPE_USE})

    public @interface Action {

    }



    @NonNull

    private final IComputerControlSession mSession;

    private final Object mLock = new Object();
@@ -103,6 +117,14 @@ public final class ComputerControlSession implements AutoCloseable { 
    @Nullable

    private ImageReader mImageReader;



    /** Perform provided action on the trusted virtual display. */

    public void performAction(@Action int actionCode) {

        try {

            mSession.performAction(actionCode);

        } catch (RemoteException e) {

            throw e.rethrowFromSystemServer();

        }

    }



    /** @hide */

    public ComputerControlSession(int displayId, @NonNull IVirtualDisplayCallback displayToken,
@@ -214,7 +236,13 @@ public final class ComputerControlSession implements AutoCloseable { 
        }

    }



    /** Injects a key event into the trusted virtual display. */

    /**

     * Injects a key event into the trusted virtual display.

     *

     * @deprecated use {@link #insertText(String, boolean, boolean)} for injecting text into the

     * text field and use {@link #performAction(int)} to perform actions like "back navigation".

     */

    @Deprecated

    public void sendKeyEvent(@NonNull VirtualKeyEvent event) {

        try {

            mSession.sendKeyEvent(Objects.requireNonNull(event));

core/java/android/companion/virtual/computercontrol/IComputerControlSession.aidl

+3 −0
Original line number Diff line number Diff line
@@ -60,6 +60,9 @@ interface IComputerControlSession { 
     */

    void insertText(in String text, boolean replaceExisting, boolean commit);



    /** Performs computer control action on the computer control display. */

    void performAction(int actionCode);



    /** Closes this session. */

    void close();

}

core/java/android/content/pm/TEST_MAPPING

+3 −0
Original line number Diff line number Diff line
@@ -299,6 +299,9 @@ 
                    "exclude-annotation":"org.junit.Ignore"

                }

            ]

        },

        {

            "name": "CtsPackageInstallerCUJDeveloperVerificationTestCases"

        }

    ],

    "presubmit-large":[