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

Commit 9e52da7c authored by Song Chun Fan's avatar Song Chun Fan Committed by Android (Google) Code Review
Browse files

Merge "Fix deadlock between PMS and AMS" into main

parents 27d0c958 c7eeb40e

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

+4 −3
Original line number Diff line number Diff line
@@ -4057,9 +4057,6 @@ public class PackageManagerService implements PackageSender, TestUtilityService 
                return;

            }



            // Log the metrics when the component state is changed.

            PackageMetrics.reportComponentStateChanged(computer, componentStateMetricsList, userId);



            if (isSynchronous) {

                flushPackageRestrictionsAsUserInternalLocked(userId);

            } else {
@@ -4079,6 +4076,10 @@ public class PackageManagerService implements PackageSender, TestUtilityService 
            }

        }



        // Log the metrics when the component state is changed.

        PackageMetrics.reportComponentStateChanged(snapshotComputer(), componentStateMetricsList,

                userId);



        final long callingId = Binder.clearCallingIdentity();

        try {

            final Computer newSnapshot = snapshotComputer();