From 87f731b26ed82ee49889bd3a8c9199089841078b Mon Sep 17 00:00:00 2001 From: jovanak Date: Mon, 2 Sep 2019 11:54:39 -0700 Subject: [PATCH] Allow --user parameter for audio service commands. This allows testing on secondary users. Change similar to ag/7022195 and ag/6936694. Fixes: 139301368 Test: cts-tradefed run cts -m CtsMediaTestCases -t android.media.cts.AudioRecordTest#testRecordNoDataForIdleUids and ... $ adb install testcases/CtsMediaTestCases.apk Success $ adb shell cmd media.audio_policy set-uid-state android.media.cts active $ adb shell cmd media.audio_policy get-uid-state android.media.cts --user 0 active $ adb shell cmd media.audio_policy get-uid-state android.media.cts --user 10 idle $ adb shell cmd media.audio_policy set-uid-state android.media.cts --user 10 active $ adb shell cmd media.audio_policy get-uid-state android.media.cts --user 10 idle $ adb shell cmd media.audio_policy set-uid-state android.media.cts active --user 10 $ adb shell cmd media.audio_policy get-uid-state android.media.cts --user 10 active $ adb shell cmd media.audio_policy set-uid-state android.media.cts idle --user 0 $ adb shell cmd media.audio_policy get-uid-state android.media.cts --user 0 idle $ adb shell cmd media.audio_policy reset-uid-state android.media.cts --user 10 $ adb shell cmd media.audio_policy get-uid-state android.media.cts --user 10 idle Change-Id: I17774efa6aca7c9b9d0af9bf9c1e75474e90d990 (cherry picked from commit be066e1a9aa613f4e7e56fbd16b35d8ad377b68f) --- .../service/AudioPolicyService.cpp | 87 ++++++++++++++----- 1 file changed, 67 insertions(+), 20 deletions(-) diff --git a/services/audiopolicy/service/AudioPolicyService.cpp b/services/audiopolicy/service/AudioPolicyService.cpp index f8cecbf6fc..a6cda20798 100644 --- a/services/audiopolicy/service/AudioPolicyService.cpp +++ b/services/audiopolicy/service/AudioPolicyService.cpp @@ -726,11 +726,11 @@ status_t AudioPolicyService::shellCommand(int in, int out, int err, 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); @@ -740,14 +740,32 @@ status_t AudioPolicyService::shellCommand(int in, int out, int err, Vector& args, int err) { +static status_t getUidForPackage(String16 packageName, int userId, /*inout*/uid_t& uid, int err) { + if (userId < 0) { + ALOGE("Invalid user: %d", userId); + dprintf(err, "Invalid user: %d\n", userId); + return BAD_VALUE; + } + PermissionController pc; - int uid = pc.getPackageUid(args[1], 0); + uid = pc.getPackageUid(packageName, 0); if (uid <= 0) { - ALOGE("Unknown package: '%s'", String8(args[1]).string()); - dprintf(err, "Unknown package: '%s'\n", String8(args[1]).string()); + ALOGE("Unknown package: '%s'", String8(packageName).string()); + dprintf(err, "Unknown package: '%s'\n", String8(packageName).string()); + return BAD_VALUE; + } + + uid = multiuser_get_uid(userId, uid); + return NO_ERROR; +} + +status_t AudioPolicyService::handleSetUidState(Vector& args, int err) { + // Valid arg.size() is 3 or 5, args.size() is 5 with --user option. + if (!(args.size() == 3 || args.size() == 5)) { + printHelp(err); return BAD_VALUE; } + bool active = false; if (args[2] == String16("active")) { active = true; @@ -755,30 +773,59 @@ status_t AudioPolicyService::handleSetUidState(Vector& args, int err) ALOGE("Expected active or idle but got: '%s'", String8(args[2]).string()); return BAD_VALUE; } + + int userId = 0; + if (args.size() >= 5 && args[3] == String16("--user")) { + userId = atoi(String8(args[4])); + } + + uid_t uid; + if (getUidForPackage(args[1], userId, uid, err) == BAD_VALUE) { + return BAD_VALUE; + } + mUidPolicy->addOverrideUid(uid, active); return NO_ERROR; } status_t AudioPolicyService::handleResetUidState(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()); + // Valid arg.size() is 2 or 4, args.size() is 4 with --user option. + if (!(args.size() == 2 || args.size() == 4)) { + printHelp(err); + return BAD_VALUE; + } + + int userId = 0; + if (args.size() >= 4 && args[2] == String16("--user")) { + userId = atoi(String8(args[3])); + } + + uid_t uid; + if (getUidForPackage(args[1], userId, uid, err) == BAD_VALUE) { return BAD_VALUE; } + mUidPolicy->removeOverrideUid(uid); return NO_ERROR; } status_t AudioPolicyService::handleGetUidState(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()); + // Valid arg.size() is 2 or 4, args.size() is 4 with --user option. + if (!(args.size() == 2 || args.size() == 4)) { + printHelp(err); + return BAD_VALUE; + } + + int userId = 0; + if (args.size() >= 4 && args[2] == String16("--user")) { + userId = atoi(String8(args[3])); + } + + uid_t uid; + if (getUidForPackage(args[1], userId, uid, err) == BAD_VALUE) { return BAD_VALUE; } + if (mUidPolicy->isUidActive(uid)) { return dprintf(out, "active\n"); } else { @@ -788,9 +835,9 @@ status_t AudioPolicyService::handleGetUidState(Vector& args, int out, status_t AudioPolicyService::printHelp(int out) { return dprintf(out, "Audio policy 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"); }