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

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

Merge "Merge \\\"Prevent crash from null ApplicationInfo after package is... 

Merge "Merge \\\"Prevent crash from null ApplicationInfo after package is removed.\\\" into nyc-dev am: 42edc7c2 am: ea5f896e am: 35866a2f"
parents 547b7439 4f6aad26

services/core/java/com/android/server/am/ActivityManagerService.java

+5 −0
Original line number Diff line number Diff line
@@ -17788,6 +17788,11 @@ public final class ActivityManagerService extends ActivityManagerNative 
                                getPackageManagerInternalLocked().getApplicationInfo(

                                        ssp,

                                        userId);

                        if (aInfo == null) {

                            Slog.w(TAG, "Dropping ACTION_PACKAGE_REPLACED for non-existent pkg:"

                                    + " ssp=" + ssp + " data=" + data);

                            return ActivityManager.BROADCAST_SUCCESS;

                        }

                        mStackSupervisor.updateActivityApplicationInfoLocked(aInfo);

                        sendPackageBroadcastLocked(IApplicationThread.PACKAGE_REPLACED,

                                new String[] {ssp}, userId);