Merge "Fix NPE" into tm-dev (8b12d853) · Commits · e / os / android_frameworks_base

services/core/java/com/android/server/pm/PackageInstallerService.java

+4 −1

Original line number	Original line	Diff line number	Diff line
	@@ -410,7 +410,10 @@ public class PackageInstallerService extends IPackageInstaller.Stub implements
	// Their staging dirs will be removed too		// Their staging dirs will be removed too
	PackageInstallerSession root = !session.hasParentSessionId()		PackageInstallerSession root = !session.hasParentSessionId()
	? session : mSessions.get(session.getParentSessionId());		? session : mSessions.get(session.getParentSessionId());
	if (!root.isDestroyed()) {		if (root == null) {
			Slog.e(TAG, "freeStageDirs: found an orphaned session: "
			+ session.sessionId + " parent=" + session.getParentSessionId());
			} else if (!root.isDestroyed()) {
	root.abandon();		root.abandon();
	}		}
	} else {		} else {