Merge "Add null check for session_info." into udc-qpr-dev am: 499f2ff0eb

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

Change-Id: I34b5d45b99e1c513e8685cd5aaabf80764009ee3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Treehugger Robot
2023-08-03 08:42:12 +00:00
committed by Automerger Merge Worker

View File

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