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

Commit ec5e0bad authored by Songchun Fan's avatar Songchun Fan Committed by Automerger Merge Worker
Browse files

Merge "[pm] skip sending PACKAGE_CHANGED broadcast if package has been... 

Merge "[pm] skip sending PACKAGE_CHANGED broadcast if package has been deleted" into tm-dev am: c45a6dd6

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18528673



Change-Id: I8ee0fb0c1af25c0599d67ff667c633bf9478e629
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 79eba698 c45a6dd6

services/core/java/com/android/server/pm/PackageManagerService.java

+5 −0
Original line number Diff line number Diff line
@@ -3952,6 +3952,11 @@ public class PackageManagerService implements PackageSender, TestUtilityService 


    void sendPackageChangedBroadcast(@NonNull Computer snapshot, String packageName,

            boolean dontKillApp, ArrayList<String> componentNames, int packageUid, String reason) {

        PackageStateInternal setting = snapshot.getPackageStateInternal(packageName,

                Process.SYSTEM_UID);

        if (setting == null) {

            return;

        }

        final int userId = UserHandle.getUserId(packageUid);

        final boolean isInstantApp =

                snapshot.isInstantAppInternal(packageName, userId, Process.SYSTEM_UID);

services/core/java/com/android/server/pm/SuspendPackageHelper.java

+2 −2
Original line number Diff line number Diff line
@@ -680,9 +680,9 @@ public final class SuspendPackageHelper { 
                } else {

                    intentExtras = null;

                }

                handler.post(() -> mBroadcastHelper.doSendBroadcast(action, null, intentExtras,

                mBroadcastHelper.doSendBroadcast(action, null, intentExtras,

                        Intent.FLAG_RECEIVER_INCLUDE_BACKGROUND, packageName, null,

                        targetUserIds, false, null, null));

                        targetUserIds, false, null, null);

            }

        });

    }