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

Commit bed85b75 authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

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

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



Change-Id: I34b5d45b99e1c513e8685cd5aaabf80764009ee3
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 741fca8a 499f2ff0

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() {