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

[pm] revert mLock changes for compat seinfo

Browse Source 
This partially reverts ag/16176950. Because we need to modify SeInfo, it
is not a read-only usage of PackageState.

BUG: 206662650
Test: atest com.android.cts.appcompat.CompatChangesSelinuxTest#testTargetSdkRAppIsInLatestDomainWithLatestOptin
Change-Id: I7260f7ef0c09669fe25f0313cc1517c56f4eaed8
This commit is contained in:
Songchun Fan
2021-11-19 00:07:41 +00:00
parent 622adb8ffe
commit eaac180189
1 changed files with 11 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
services/core/java/com/android/server/pm/PackageManagerService.java
View File

@@ -1500,16 +1500,19 @@ public class PackageManagerService extends IPackageManager.Stub
final CompatChange.ChangeListener selinuxChangeListener = packageName -> {
synchronized (m.mInstallLock) {
final AndroidPackage pkg;
final PackageSetting ps;
final SharedUserSetting sharedUser;
final String oldSeInfo;
final PackageStateInternal packageState = m.getPackageStateInternal(packageName);
if (packageState == null) {
Slog.e(TAG, "Failed to find package setting " + packageName);
return;
synchronized (m.mLock) {
ps = m.mSettings.getPackageLPr(packageName);
if (ps == null) {
Slog.e(TAG, "Failed to find package setting " + packageName);
return;
}
pkg = ps.getPkg();
sharedUser = ps.getSharedUser();
oldSeInfo = AndroidPackageUtils.getSeInfo(pkg, ps);
}
pkg = packageState.getPkg();
sharedUser = packageState.getSharedUser();
oldSeInfo = AndroidPackageUtils.getSeInfo(pkg, packageState);
if (pkg == null) {
Slog.e(TAG, "Failed to find package " + packageName);
@@ -1521,7 +1524,7 @@ public class PackageManagerService extends IPackageManager.Stub
if (!newSeInfo.equals(oldSeInfo)) {
Slog.i(TAG, "Updating seInfo for package " + packageName + " from: "
+ oldSeInfo + " to: " + newSeInfo);
packageState.getTransientState().setOverrideSeInfo(newSeInfo);
ps.getPkgState().setOverrideSeInfo(newSeInfo);
m.mAppDataHelper.prepareAppDataAfterInstallLIF(pkg);
}
}