joy/android_packages_modules_Connectivity
Watch
1
Fork
You've already forked android_packages_modules_Connectivity
 0
Code Issues Pull requests Projects Releases Wiki Activity

Merge "Use 'cmd package list packages' to get the app uid." am: d7054da22b

Browse source 
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2128505

Change-Id: I714681ea5ce047d771d93b1f130daebc97cc1baf
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Sudheer Shanka 2022-06-17 20:12:49 +00:00 • committed by Automerger Merge Worker
commit 19fb698c8d
1 changed files with 11 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

23
tests/cts/hostside/src/com/android/cts/net/HostsideNetworkTestCase.java
View file

@ -34,8 +34,6 @@ import com.android.tradefed.testtype.IBuildReceiver;
import java.io.FileNotFoundException; import java.io.FileNotFoundException;
import java.util.Map; import java.util.Map;
import java.util.regex.Matcher;
import java.util.regex.Pattern;
abstract class HostsideNetworkTestCase extends DeviceTestCase implements IAbiReceiver, abstract class HostsideNetworkTestCase extends DeviceTestCase implements IAbiReceiver,
IBuildReceiver { IBuildReceiver {
@ -171,18 +169,19 @@ abstract class HostsideNetworkTestCase extends DeviceTestCase implements IAbiRec
} }
} }
private static final Pattern UID_PATTERN =
Pattern.compile(".*userId=([0-9]+)$", Pattern.MULTILINE);
protected int getUid(String packageName) throws DeviceNotAvailableException { protected int getUid(String packageName) throws DeviceNotAvailableException {
final String output = runCommand("dumpsys package " + packageName); final int currentUser = getDevice().getCurrentUser();
final Matcher matcher = UID_PATTERN.matcher(output); final String uidLines = runCommand(
while (matcher.find()) { "cmd package list packages -U --user " + currentUser + " " + packageName);
final String match = matcher.group(1); for (String uidLine : uidLines.split("\n")) {
return Integer.parseInt(match); if (uidLine.startsWith("package:" + packageName + " uid:")) {
final String[] uidLineParts = uidLine.split(":");
// 3rd entry is package uid
return Integer.parseInt(uidLineParts[2].trim());
}
} }
throw new RuntimeException("Did not find regexp '" + UID_PATTERN + "' on adb output\n" throw new IllegalStateException("Failed to find the test app on the device; pkg="
+ output); + packageName + ", u=" + currentUser);
} }
protected String runCommand(String command) throws DeviceNotAvailableException { protected String runCommand(String command) throws DeviceNotAvailableException {