Add null check for session_info.
Bug: 288609881
Bug: 293915723
Test: presubmit
Change-Id: Iec68681e940cbff68160c7300d1634f3e6cd2f46
(cherry picked from commit 6017d72212)
Merged-In: Iec68681e940cbff68160c7300d1634f3e6cd2f46
This commit is contained in:
committed by
Sumedh Sen
parent
a94f9843a6
commit
a67147a4a4
@@ -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() {
|
||||
|
||||
Reference in New Issue
Block a user