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

Commit da7cd05c authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Camera: Add the current user id when checking for rotate&crop" into sc-v2-dev

parents 5ef4f432 065b2c11

camera/aidl/android/hardware/ICameraServiceProxy.aidl

+1 −1
Original line number Diff line number Diff line
@@ -43,5 +43,5 @@ interface ICameraServiceProxy 
     * {@link android.hardware.camera2.CameraMetadata#SCALER_ROTATE_AND_CROP_180},

     * {@link android.hardware.camera2.CameraMetadata#SCALER_ROTATE_AND_CROP_270}).

     */

    int getRotateAndCropOverride(String packageName, int lensFacing);

    int getRotateAndCropOverride(String packageName, int lensFacing, int userId);

}

services/camera/libcameraservice/CameraService.cpp

+9 −5
Original line number Diff line number Diff line
@@ -1835,8 +1835,10 @@ Status CameraService::connectHelper(const sp<CALLBACK>& cameraCb, const String8& 
        if (mOverrideRotateAndCropMode != ANDROID_SCALER_ROTATE_AND_CROP_AUTO) {

            client->setRotateAndCropOverride(mOverrideRotateAndCropMode);

        } else if (effectiveApiLevel == API_2) {

            client->setRotateAndCropOverride(CameraServiceProxyWrapper::getRotateAndCropOverride(

                    clientPackageName, facing));



          client->setRotateAndCropOverride(

              CameraServiceProxyWrapper::getRotateAndCropOverride(

                  clientPackageName, facing, multiuser_get_user_id(clientUid)));

        }



        // Set camera muting behavior
@@ -2219,7 +2221,9 @@ Status CameraService::notifyDisplayConfigurationChange() { 
            if (basicClient.get() != nullptr && basicClient->canCastToApiClient(API_2)) {

              basicClient->setRotateAndCropOverride(

                  CameraServiceProxyWrapper::getRotateAndCropOverride(

                            basicClient->getPackageName(), basicClient->getCameraFacing()));

                      basicClient->getPackageName(),

                      basicClient->getCameraFacing(),

                      multiuser_get_user_id(basicClient->getClientUid())));

            }

        }

    }

services/camera/libcameraservice/utils/CameraServiceProxyWrapper.cpp

+3 −2
Original line number Diff line number Diff line
@@ -120,11 +120,12 @@ void CameraServiceProxyWrapper::pingCameraServiceProxy() { 
    proxyBinder->pingForUserUpdate();

}



int CameraServiceProxyWrapper::getRotateAndCropOverride(String16 packageName, int lensFacing) {

int CameraServiceProxyWrapper::getRotateAndCropOverride(String16 packageName, int lensFacing,

        int userId) {

    sp<ICameraServiceProxy> proxyBinder = getCameraServiceProxy();

    if (proxyBinder == nullptr) return true;

    int ret = 0;

    auto status = proxyBinder->getRotateAndCropOverride(packageName, lensFacing, &ret);

    auto status = proxyBinder->getRotateAndCropOverride(packageName, lensFacing, userId, &ret);

    if (!status.isOk()) {

        ALOGE("%s: Failed during top activity orientation query: %s", __FUNCTION__,

                status.exceptionMessage().c_str());

services/camera/libcameraservice/utils/CameraServiceProxyWrapper.h

+1 −1
Original line number Diff line number Diff line
@@ -92,7 +92,7 @@ public: 
    static void pingCameraServiceProxy();



    // Return the current top activity rotate and crop override.

    static int getRotateAndCropOverride(String16 packageName, int lensFacing);

    static int getRotateAndCropOverride(String16 packageName, int lensFacing, int userId);

};



} // android