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

Commit 42edc7c2 authored by Chong Zhang's avatar Chong Zhang Committed by Android (Google) Code Review
Browse files

Merge "Prevent crash from null ApplicationInfo after package is removed." into nyc-dev

parents 62b08eb5 1de22da7

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

+5 −0
Original line number Diff line number Diff line
@@ -17784,6 +17784,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);