Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit eb6733e9 authored by Jeff Sharkey's avatar Jeff Sharkey Committed by android-build-merger
Browse files

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

am: 65abebba

Change-Id: I5a78f799bde2926eb3f5f6f424148aaf11729c54
parents 756685b5 65abebba

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

+3 −2
Original line number Diff line number Diff line
@@ -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();

                }