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

Merge "Build splitPermissions manually for PackageParser"

Browse Source
This commit is contained in:
Winson Chiu
2022-02-15 18:27:25 +00:00
committed by Android (Google) Code Review
parent a49e26c27c d0fb8ac83a
commit 2fd963f3a4
2 changed files with 24 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
core/java/android/content/pm/PackageManager.java
View File

@@ -8035,6 +8035,7 @@ public abstract class PackageManager {
return PackageParser.generatePackageInfo(pkg, null, (int) flagsBits, 0, 0, null,
FrameworkPackageUserState.DEFAULT);
} catch (PackageParser.PackageParserException e) {
Log.w(TAG, "Failure to parse package archive", e);
return null;
}
}

26
core/java/android/content/pm/PackageParser.java
View File

@@ -59,6 +59,7 @@ import android.content.IntentFilter;
import android.content.pm.overlay.OverlayPaths;
import android.content.pm.parsing.result.ParseResult;
import android.content.pm.parsing.result.ParseTypeImpl;
import android.content.pm.permission.SplitPermissionInfoParcelable;
import android.content.pm.pkg.FrameworkPackageUserState;
import android.content.res.ApkAssets;
import android.content.res.AssetManager;
@@ -2417,9 +2418,28 @@ public class PackageParser {
Slog.i(TAG, newPermsMsg.toString());
}
final List<PermissionManager.SplitPermissionInfo> splitPermissions =
ActivityThread.currentApplication().getSystemService(PermissionManager.class)
.getSplitPermissions();
// Must build permission info manually for legacy code, which can be called before
// Appication is available through the app process, so the normal API doesn't work.
List<SplitPermissionInfoParcelable> splitPermissionParcelables;
try {
splitPermissionParcelables = ActivityThread.getPermissionManager()
.getSplitPermissions();
} catch (RemoteException e) {
splitPermissionParcelables = Collections.emptyList();
}
int splitPermissionsSize = splitPermissionParcelables.size();
List<PermissionManager.SplitPermissionInfo> splitPermissions =
new ArrayList<>(splitPermissionsSize);
for (int index = 0; index < splitPermissionsSize; index++) {
SplitPermissionInfoParcelable splitPermissionParcelable =
splitPermissionParcelables.get(index);
splitPermissions.add(new PermissionManager.SplitPermissionInfo(
splitPermissionParcelable.getSplitPermission(),
splitPermissionParcelable.getNewPermissions(),
splitPermissionParcelable.getTargetSdk()
));
}
final int listSize = splitPermissions.size();
for (int is = 0; is < listSize; is++) {