Merge "Add null check for session_info." (fb189a07) · Commits · e / os / android_frameworks_base

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

+9 −2

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