gugelfrei
/
android_frameworks_av
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Allow a --user param for cmd media.camera commands.

Browse Source 
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
gugelfrei
Nicholas Sauer 5 years ago
parent 6e38e1a2b7
commit a362033b87
1 changed files with 61 additions and 26 deletions
Show Stats Download Patch File Download Diff File

87
services/camera/libcameraservice/CameraService.cpp
Unescape View File

@ -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<Stri
if (in == BAD_TYPE || out == BAD_TYPE || err == BAD_TYPE) {
return BAD_VALUE;
}
if (args.size() == 3 && args[0] == String16("set-uid-state")) {
if (args.size() >= 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<Stri
}
status_t CameraService::handleSetUidState(const Vector<String16>& 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<String16>& 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<String16>& 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<String16>& 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<String16>& args, int out,
status_t CameraService::printHelp(int out) {
return dprintf(out, "Camera service commands:\n"
" get-uid-state <PACKAGE> gets the uid state\n"
" set-uid-state <PACKAGE> <active|idle> overrides the uid state\n"
" reset-uid-state <PACKAGE> clears the uid state override\n"
" get-uid-state <PACKAGE> [--user USER_ID] gets the uid state\n"
" set-uid-state <PACKAGE> <active|idle> [--user USER_ID] overrides the uid state\n"
" reset-uid-state <PACKAGE> [--user USER_ID] clears the uid state override\n"
" help print this message\n");
}

Write Preview
Loading…
Cancel
Save