From a362033b87bad8bacf3b9fe91cb251d2bb9b18d6 Mon Sep 17 00:00:00 2001 From: Nicholas Sauer Date: Wed, 3 Apr 2019 14:05:17 -0700 Subject: [PATCH] Allow a --user param for cmd media.camera commands. This allows testing on secondary users. For more information, please see go/aae-cts-on-u10 bug: 126472822 Test: Create and switch to secondary user. $ cts-tradefed run cts -a arm64-v8a -m CtsCameraTestCases -t android.hardware.camera2.cts.IdleUidTest and ... $ adb install testcases/CtsCameraTestCases.apk Success $ adb shell cmd media.camera get-uid-state android.camera.cts --user 10 idle $ adb shell cmd media.camera set-uid-state android.camera.cts active --user 10 $ adb shell cmd media.camera get-uid-state android.camera.cts --user 10 active $ adb shell cmd media.camera get-uid-state android.camera.cts --user 0 idle $ adb shell cmd media.camera get-uid-state android.camera.cts idle $ adb shell cmd media.camera reset-uid-state android.camera.cts --user 10 $ adb shell cmd media.camera get-uid-state android.camera.cts idle $ adb shell cmd media.camera get-uid-state android.camera.cts --user 10 idle Change-Id: I7a5a3455d36ce6b95638ff13313f06e7e9b92feb --- .../camera/libcameraservice/CameraService.cpp | 87 +++++++++++++------ 1 file changed, 61 insertions(+), 26 deletions(-) diff --git a/services/camera/libcameraservice/CameraService.cpp b/services/camera/libcameraservice/CameraService.cpp index 8113c3f19b..8354ed5f94 100644 --- a/services/camera/libcameraservice/CameraService.cpp +++ b/services/camera/libcameraservice/CameraService.cpp @@ -858,6 +858,25 @@ static bool isTrustedCallingUid(uid_t uid) { } } +static status_t getUidForPackage(String16 packageName, int userId, /*inout*/uid_t& uid, int err) { + PermissionController pc; + uid = pc.getPackageUid(packageName, 0); + if (uid <= 0) { + ALOGE("Unknown package: '%s'", String8(packageName).string()); + dprintf(err, "Unknown package: '%s'\n", String8(packageName).string()); + return BAD_VALUE; + } + + if (userId < 0) { + ALOGE("Invalid user: %d", userId); + dprintf(err, "Invalid user: %d\n", userId); + return BAD_VALUE; + } + + uid = multiuser_get_uid(userId, uid); + return NO_ERROR; +} + Status CameraService::validateConnectLocked(const String8& cameraId, const String8& clientName8, /*inout*/int& clientUid, /*inout*/int& clientPid, /*out*/int& originalClientPid) const { @@ -3315,11 +3334,11 @@ status_t CameraService::shellCommand(int in, int out, int err, const Vector= 3 && args[0] == String16("set-uid-state")) { return handleSetUidState(args, err); - } else if (args.size() == 2 && args[0] == String16("reset-uid-state")) { + } else if (args.size() >= 2 && args[0] == String16("reset-uid-state")) { return handleResetUidState(args, err); - } else if (args.size() == 2 && args[0] == String16("get-uid-state")) { + } else if (args.size() >= 2 && args[0] == String16("get-uid-state")) { return handleGetUidState(args, out, err); } else if (args.size() == 1 && args[0] == String16("help")) { printHelp(out); @@ -3330,13 +3349,8 @@ status_t CameraService::shellCommand(int in, int out, int err, const Vector& args, int err) { - PermissionController pc; - int uid = pc.getPackageUid(args[1], 0); - if (uid <= 0) { - ALOGE("Unknown package: '%s'", String8(args[1]).string()); - dprintf(err, "Unknown package: '%s'\n", String8(args[1]).string()); - return BAD_VALUE; - } + String16 packageName = args[1]; + bool active = false; if (args[2] == String16("active")) { active = true; @@ -3344,31 +3358,52 @@ status_t CameraService::handleSetUidState(const Vector& args, int err) ALOGE("Expected active or idle but got: '%s'", String8(args[2]).string()); return BAD_VALUE; } - mUidPolicy->addOverrideUid(uid, args[1], active); + + int userId = 0; + if (args.size() >= 5 && args[3] == String16("--user")) { + userId = atoi(String8(args[4])); + } + + uid_t uid; + if (getUidForPackage(packageName, userId, uid, err) == BAD_VALUE) { + return BAD_VALUE; + } + + mUidPolicy->addOverrideUid(uid, packageName, active); return NO_ERROR; } status_t CameraService::handleResetUidState(const Vector& args, int err) { - PermissionController pc; - int uid = pc.getPackageUid(args[1], 0); - if (uid < 0) { - ALOGE("Unknown package: '%s'", String8(args[1]).string()); - dprintf(err, "Unknown package: '%s'\n", String8(args[1]).string()); + String16 packageName = args[1]; + + int userId = 0; + if (args.size() >= 4 && args[2] == String16("--user")) { + userId = atoi(String8(args[3])); + } + + uid_t uid; + if (getUidForPackage(packageName, userId, uid, err) == BAD_VALUE) { return BAD_VALUE; } - mUidPolicy->removeOverrideUid(uid, args[1]); + + mUidPolicy->removeOverrideUid(uid, packageName); return NO_ERROR; } status_t CameraService::handleGetUidState(const Vector& args, int out, int err) { - PermissionController pc; - int uid = pc.getPackageUid(args[1], 0); - if (uid <= 0) { - ALOGE("Unknown package: '%s'", String8(args[1]).string()); - dprintf(err, "Unknown package: '%s'\n", String8(args[1]).string()); + String16 packageName = args[1]; + + int userId = 0; + if (args.size() >= 4 && args[2] == String16("--user")) { + userId = atoi(String8(args[3])); + } + + uid_t uid; + if (getUidForPackage(packageName, userId, uid, err) == BAD_VALUE) { return BAD_VALUE; } - if (mUidPolicy->isUidActive(uid, args[1])) { + + if (mUidPolicy->isUidActive(uid, packageName)) { return dprintf(out, "active\n"); } else { return dprintf(out, "idle\n"); @@ -3377,9 +3412,9 @@ status_t CameraService::handleGetUidState(const Vector& args, int out, status_t CameraService::printHelp(int out) { return dprintf(out, "Camera service commands:\n" - " get-uid-state gets the uid state\n" - " set-uid-state overrides the uid state\n" - " reset-uid-state clears the uid state override\n" + " get-uid-state [--user USER_ID] gets the uid state\n" + " set-uid-state [--user USER_ID] overrides the uid state\n" + " reset-uid-state [--user USER_ID] clears the uid state override\n" " help print this message\n"); }