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

Merge "Fix deadlock in StagingManager.getSessions() method" into rvc-dev

Browse Source
This commit is contained in:
Mohammad Samiul Islam
2020-07-10 19:35:58 +00:00
committed by Android (Google) Code Review
parent 6c440de7a4 3aa1f5aa16
commit c25a56caed
2 changed files with 10 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
services/core/java/com/android/server/pm/PackageInstallerService.java
View File

@@ -865,7 +865,16 @@ public class PackageInstallerService extends IPackageInstaller.Stub implements
@Override @Override
public ParceledListSlice<SessionInfo> getStagedSessions() { public ParceledListSlice<SessionInfo> getStagedSessions() {
return mStagingManager.getSessions(Binder.getCallingUid()); final List<SessionInfo> result = new ArrayList<>();
synchronized (mSessions) {
for (int i = 0; i < mSessions.size(); i++) {
final PackageInstallerSession session = mSessions.valueAt(i);
if (session.isStaged() && !session.isDestroyed()) {
result.add(session.generateInfoForCaller(false, Binder.getCallingUid()));
}
}
}
return new ParceledListSlice<>(result);
} }
@Override @Override

15
services/core/java/com/android/server/pm/StagingManager.java
View File

@@ -38,7 +38,6 @@ import android.content.pm.PackageManagerInternal;
import android.content.pm.PackageParser.PackageParserException; import android.content.pm.PackageParser.PackageParserException;
import android.content.pm.PackageParser.SigningDetails; import android.content.pm.PackageParser.SigningDetails;
import android.content.pm.PackageParser.SigningDetails.SignatureSchemeVersion; import android.content.pm.PackageParser.SigningDetails.SignatureSchemeVersion;
import android.content.pm.ParceledListSlice;
import android.content.pm.parsing.PackageInfoWithoutStateUtils; import android.content.pm.parsing.PackageInfoWithoutStateUtils;
import android.content.rollback.IRollbackManager; import android.content.rollback.IRollbackManager;
import android.content.rollback.RollbackInfo; import android.content.rollback.RollbackInfo;
@@ -180,20 +179,6 @@ public class StagingManager {
} }
} }
ParceledListSlice<PackageInstaller.SessionInfo> getSessions(int callingUid) {
final List<PackageInstaller.SessionInfo> result = new ArrayList<>();
synchronized (mStagedSessions) {
for (int i = 0; i < mStagedSessions.size(); i++) {
final PackageInstallerSession stagedSession = mStagedSessions.valueAt(i);
if (stagedSession.isDestroyed()) {
continue;
}
result.add(stagedSession.generateInfoForCaller(false /*icon*/, callingUid));
}
}
return new ParceledListSlice<>(result);
}
/** /**
* Validates the signature used to sign the container of the new apex package * Validates the signature used to sign the container of the new apex package
* *