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

Unverified Commit ba635998 authored by Michael Bestas's avatar Michael Bestas
Browse files

Merge tag 'android-13.0.0_r52' into staging/lineage-20.0_merge-android-13.0.0_r52 

Android 13.0.0 Release 52 (TQ3A.230605.012)

# -----BEGIN PGP SIGNATURE-----
#
# iF0EABECAB0WIQRDQNE1cO+UXoOBCWTorT+BmrEOeAUCZIi36gAKCRDorT+BmrEO
# eFKKAJ40jwGdyhaDLn7/Na5t0DcdSL3kEwCdHSmtok9Ml0wTeqm6cgV5Baly4Tw=
# =9WJZ
# -----END PGP SIGNATURE-----
# gpg: Signature made Tue Jun 13 21:39:38 2023 EEST
# gpg:                using DSA key 4340D13570EF945E83810964E8AD3F819AB10E78
# gpg: Good signature from "The Android Open Source Project <initial-contribution@android.com>" [marginal]
# gpg: initial-contribution@android.com: Verified 1690 signatures in the past
#      19 months.  Encrypted 4 messages in the past 17 months.
# gpg: WARNING: This key is not certified with sufficiently trusted signatures!
# gpg:          It is not certain that the signature belongs to the owner.
# Primary key fingerprint: 4340 D135 70EF 945E 8381  0964 E8AD 3F81 9AB1 0E78

# By Andy Hung (8) and others
# Via Automerger Merge Worker (72) and others
* tag 'android-13.0.0_r52': (56 commits)
  Camera: Override transform of all inflight requests
  Fix NuMediaExtractor::readSampleData buffer Handling
  Fix a couple of OOB read bugs found by the fuzzer.
  audio policy: optimize preferred device selection
  Spatializer: Tuning for least squares prediction
  DO NOT MERGE Force slowJpegMode on certain camera1 apps
  DO NOT MERGE Camera: Enable session parameter handling for Rotate&Crop
  Turn off overrideToPortrait where not needed.
  Spatial Audio: Fix display orientation, add fold state
  CCodec: Push blank buffer at the end of protected content
  Spatial Audio: Improve Head-Tracking prediction
  Spatial Audio: Log head tracking velocity in degrees / s
  CCodec: push a blank buffer at the end correctly
  Spatial Audio: Add sensor logging
  Spatial Audio: Roll pitch yaw logging.
  Revert "audio policy: fix sensor privacy listener"
  Spatial Audio: Generalize VectorRecorder for logging
  Camera: document multiResolution raw behavior
  HeadTracking: Make QuarternionUtil.h available
  Suspend significantly flakey test until fixed.
  ...

Change-Id: I7e4376a4ad1d0a7062cb53c067e18136e83d6719
parents b248aca0 8984025a

camera/Camera.cpp

+3 −2
Original line number Diff line number Diff line
@@ -71,10 +71,11 @@ Camera::~Camera() 
}



sp<Camera> Camera::connect(int cameraId, const String16& clientPackageName,

        int clientUid, int clientPid, int targetSdkVersion, bool overrideToPortrait)

        int clientUid, int clientPid, int targetSdkVersion, bool overrideToPortrait,

        bool forceSlowJpegMode)

{

    return CameraBaseT::connect(cameraId, clientPackageName, clientUid,

            clientPid, targetSdkVersion, overrideToPortrait);

            clientPid, targetSdkVersion, overrideToPortrait, forceSlowJpegMode);

}



status_t Camera::reconnect()

camera/CameraBase.cpp

+5 −3
Original line number Diff line number Diff line
@@ -163,7 +163,7 @@ template <typename TCam, typename TCamTraits> 
sp<TCam> CameraBase<TCam, TCamTraits>::connect(int cameraId,

                                               const String16& clientPackageName,

                                               int clientUid, int clientPid, int targetSdkVersion,

                                               bool overrideToPortrait)

                                               bool overrideToPortrait, bool forceSlowJpegMode)

{

    ALOGV("%s: connect", __FUNCTION__);

    sp<TCam> c = new TCam(cameraId);
@@ -173,9 +173,11 @@ sp<TCam> CameraBase<TCam, TCamTraits>::connect(int cameraId, 
    binder::Status ret;

    if (cs != nullptr) {

        TCamConnectService fnConnectService = TCamTraits::fnConnectService;

        ALOGI("Connect camera (legacy API) - overrideToPortrait %d", overrideToPortrait);

        ALOGI("Connect camera (legacy API) - overrideToPortrait %d, forceSlowJpegMode %d",

                overrideToPortrait, forceSlowJpegMode);

        ret = (cs.get()->*fnConnectService)(cl, cameraId, clientPackageName, clientUid,

                clientPid, targetSdkVersion, overrideToPortrait, /*out*/ &c->mCamera);

                clientPid, targetSdkVersion, overrideToPortrait, forceSlowJpegMode,

                 /*out*/ &c->mCamera);

    }

    if (ret.isOk() && c->mCamera != nullptr) {

        IInterface::asBinder(c->mCamera)->linkToDeath(c);

camera/aidl/android/hardware/ICameraService.aidl

+2 −1
Original line number Diff line number Diff line
@@ -84,7 +84,8 @@ interface ICameraService 
            String opPackageName,

            int clientUid, int clientPid,

            int targetSdkVersion,

            boolean overrideToPortrait);

            boolean overrideToPortrait,

            boolean forceSlowJpegMode);



    /**

     * Open a camera device through the new camera API

camera/include/camera/Camera.h

+2 −2
Original line number Diff line number Diff line
@@ -58,7 +58,7 @@ struct CameraTraits<Camera> 
    typedef ::android::hardware::ICameraClient TCamCallbacks;

    typedef ::android::binder::Status(::android::hardware::ICameraService::*TCamConnectService)

        (const sp<::android::hardware::ICameraClient>&,

        int, const String16&, int, int, int, bool,

        int, const String16&, int, int, int, bool, bool,

        /*out*/

        sp<::android::hardware::ICamera>*);

    static TCamConnectService     fnConnectService;
@@ -82,7 +82,7 @@ public: 
    static  sp<Camera>  connect(int cameraId,

                                const String16& clientPackageName,

                                int clientUid, int clientPid, int targetSdkVersion,

                                bool overrideToPortrait);

                                bool overrideToPortrait, bool forceSlowJpegMode);



            virtual     ~Camera();

camera/include/camera/CameraBase.h

+1 −1
Original line number Diff line number Diff line
@@ -120,7 +120,7 @@ public: 
    static sp<TCam>      connect(int cameraId,

                                 const String16& clientPackageName,

                                 int clientUid, int clientPid, int targetSdkVersion,

                                 bool overrideToPortrait);

                                 bool overrideToPortrait, bool forceSlowJpegMode);

    virtual void         disconnect();



    void                 setListener(const sp<TCamListener>& listener);