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

Commit 35866a2f authored by Chong Zhang's avatar Chong Zhang Committed by android-build-merger
Browse files

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

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

Change-Id: I5db5d39c5da7a9fe7e297bdb217d20bb6c06bbdd
parents 1f662ef5 ea5f896e

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