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

am: 65abebbadd Change-Id: I5a78f799bde2926eb3f5f6f424148aaf11729c54
2017-08-02 19:33:49 +00:00
parent 756685b506 65abebbadd
commit eb6733e93a
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
@@ -1360,8 +1360,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();
                }