Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a67147a4 authored by Alex Buynytskyy's avatar Alex Buynytskyy Committed by Sumedh Sen
Browse files

Add null check for session_info. 

Bug: 288609881
Bug: 293915723
Test: presubmit
Change-Id: Iec68681e940cbff68160c7300d1634f3e6cd2f46
(cherry picked from commit 6017d722)
Merged-In: Iec68681e940cbff68160c7300d1634f3e6cd2f46
parent a94f9843

packages/PackageInstaller/src/com/android/packageinstaller/InstallStart.java

+9 −2
Original line number Diff line number Diff line
@@ -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() {