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

Merge "Add null check for session_info." into udc-qpr-dev

Browse Source
This commit is contained in:
Treehugger Robot
2023-08-03 07:57:53 +00:00
committed by Android (Google) Code Review
parent f63e52db44 a67147a4a4
commit 499f2ff0eb
1 changed files with 9 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
packages/PackageInstaller/src/com/android/packageinstaller/InstallStart.java
View File

@@ -279,9 +279,16 @@ public class InstallStart extends Activity {
} }
private boolean isCallerSessionOwner(int originatingUid, int sessionId) { private boolean isCallerSessionOwner(int originatingUid, int sessionId) {
if (originatingUid == Process.ROOT_UID) {
return true;
}
PackageInstaller packageInstaller = getPackageManager().getPackageInstaller(); PackageInstaller packageInstaller = getPackageManager().getPackageInstaller();
int installerUid = packageInstaller.getSessionInfo(sessionId).getInstallerUid(); PackageInstaller.SessionInfo sessionInfo = packageInstaller.getSessionInfo(sessionId);
return (originatingUid == Process.ROOT_UID) || (originatingUid == installerUid); if (sessionInfo == null) {
return false;
}
int installerUid = sessionInfo.getInstallerUid();
return originatingUid == installerUid;
} }
private void checkDevicePolicyRestriction() { private void checkDevicePolicyRestriction() {