Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "ActivityManagerService: add SdkSandbox-Client-Package header" into tm-qpr-dev am: 73ae1f3fe7

Browse Source 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19693812

Change-Id: Ibf50e462fc7352ba2ba190c8809b97b3f39a7cce
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Will Burr
2022-08-31 23:37:41 +00:00
committed by Automerger Merge Worker
parent ae685a115d 73ae1f3fe7
commit a2e9019b6d
1 changed files with 28 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
services/core/java/com/android/server/am/ActivityManagerService.java
View File

@@ -8745,12 +8745,40 @@ public class ActivityManagerService extends IActivityManager.Stub
if (process.info.isInstantApp()) {
sb.append("Instant-App: true\n");
}
if (isSdkSandboxUid(process.uid)) {
final int appUid = Process.getAppUidForSdkSandboxUid(process.uid);
try {
String[] clientPackages = pm.getPackagesForUid(appUid);
// In shared UID case, don't add the package information
if (clientPackages.length == 1) {
appendSdkSandboxClientPackageHeader(sb, clientPackages[0], callingUserId);
}
} catch (RemoteException e) {
Slog.e(TAG, "Error getting packages for client app uid: " + appUid, e);
}
sb.append("SdkSandbox: true\n");
}
}
}
private void appendSdkSandboxClientPackageHeader(StringBuilder sb, String pkg, int userId) {
final IPackageManager pm = AppGlobals.getPackageManager();
sb.append("SdkSandbox-Client-Package: ").append(pkg);
try {
final PackageInfo pi = pm.getPackageInfo(pkg, 0, userId);
if (pi != null) {
sb.append(" v").append(pi.getLongVersionCode());
if (pi.versionName != null) {
sb.append(" (").append(pi.versionName).append(")");
}
}
} catch (RemoteException e) {
Slog.e(TAG, "Error getting package info for SDK sandbox client: " + pkg, e);
}
sb.append("\n");
}
private static String processClass(ProcessRecord process) {
if (process == null || process.getPid() == MY_PID) {
return "system_server";