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

am: eb6733e93a Change-Id: I4bb82ed141cf10d74c5e6d0c08346cd6aeb73931
2017-08-02 22:43:52 +00:00
parent caab68931b eb6733e93a
commit 1ab9c0cdff
1 changed files with 3 additions and 2 deletions
--- a/core/java/android/content/pm/PackageInstaller.java
+++ b/core/java/android/content/pm/PackageInstaller.java
@@ -1406,8 +1406,9 @@ public class PackageInstaller {
                // 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();
                }