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

Commit 25cdef21 authored by Android Build Merger (Role)'s avatar Android Build Merger (Role) Committed by Android (Google) Code Review
Browse files

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

Merge "Merge "Fix NPE when reading icon for removed session." into oc-dr1-dev am: 65abebba" into oc-mr1-dev
parents fe268483 623fbea9

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

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

                }