commit 623fbea979cfb477090612d16c8fd30bd62b7589
author Jeff Sharkey <jsharkey@android.com> Wed Aug 02 22:49:42 2017 +0000
committer android-build-merger <android-build-merger@google.com> Wed Aug 02 22:49:42 2017 +0000
tree 0a0985d15d7525866cf3ed8b50ec98456ff75ecc
parent 64dd913f689da9ef38cbe5d4465494da25455bba
parent 65abebbadd94468a4f478fdf567ec50a8d63a4f9

Merge "Fix NPE when reading icon for removed session." into oc-dr1-dev
am: 65abebbadd

Change-Id: I6ef312422ea84b352f8d07a9937c64394b14776a

core/java/android/content/pm/PackageInstaller.java

diff --git a/core/java/android/content/pm/PackageInstaller.java b/core/java/android/content/pm/PackageInstaller.java
index ea675fb..c3ebf55 100644
--- a/core/java/android/content/pm/PackageInstaller.java
+++ b/core/java/android/content/pm/PackageInstaller.java
@@ -1406,8 +1406,9 @@
                 // Icon may have been omitted for calls that return bulk session
                 // lists, so try fetching the specific icon.
                 try {
-                    appIcon = AppGlobals.getPackageManager().getPackageInstaller()
-                            .getSessionInfo(sessionId).appIcon;
+                    final SessionInfo info = AppGlobals.getPackageManager().getPackageInstaller()
+                            .getSessionInfo(sessionId);
+                    appIcon = (info != null) ? info.appIcon : null;
                 } catch (RemoteException e) {
                     throw e.rethrowFromSystemServer();
                 }