commit 065b2c117242dfc74f462d647d87cff21c44a94c
author Emilian Peev <epeev@google.com> Tue Nov 23 13:12:57 2021 -0800
committer Emilian Peev <epeev@google.com> Wed Dec 08 11:39:53 2021 -0800
tree 199b7d162baf18515fde47b622fcea7699d20378
parent 3de1764659f5d05897daf84e1bf43ad44ef29a74

Camera: Add the current user id when checking for rotate&crop

Add the current user id as part of the arguments when checking
for rotate&crop override values.

Bug: 203044281
Test: Manual using camera application

Change-Id: Ic8a32f19f61c7f96b83573de81d8cc2b64aaeb3c

services/camera/libcameraservice/CameraService.cpp

diff --git a/services/camera/libcameraservice/CameraService.cpp b/services/camera/libcameraservice/CameraService.cpp
index 7dd8374..4dfbb6f 100644
--- a/services/camera/libcameraservice/CameraService.cpp
+++ b/services/camera/libcameraservice/CameraService.cpp
@@ -1835,8 +1835,10 @@
         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
@@ -2217,9 +2219,11 @@
         if (current != nullptr) {
             const auto basicClient = current->getValue();
             if (basicClient.get() != nullptr && basicClient->canCastToApiClient(API_2)) {
-                basicClient->setRotateAndCropOverride(
-                        CameraServiceProxyWrapper::getRotateAndCropOverride(
-                            basicClient->getPackageName(), basicClient->getCameraFacing()));
+              basicClient->setRotateAndCropOverride(
+                  CameraServiceProxyWrapper::getRotateAndCropOverride(
+                      basicClient->getPackageName(),
+                      basicClient->getCameraFacing(),
+                      multiuser_get_user_id(basicClient->getClientUid())));
             }
         }
     }