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

Commit 4f6aad26 authored by Chong Zhang's avatar Chong Zhang Committed by android-build-merger
Browse files

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

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

Change-Id: Idda3e5d9bd691cfd7a3c76614ded0d64e1f04b0c
parents 44a3ef6e 35866a2f

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);