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

Commit fb5bcb43 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Remove everything from under the lock." into sc-dev am: 4895062e am: da61285b

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

Change-Id: I921d164a59793c04a79d8da40f9f4ed73768ea4c
parents b31526a4 da61285b
Loading
Loading
Loading
Loading
+13 −14
Original line number Diff line number Diff line
@@ -9556,11 +9556,7 @@ public class PackageManagerService extends IPackageManager.Stub
    @Override
    public boolean isProtectedBroadcast(String actionName) {
        // allow instant applications
        synchronized (mProtectedBroadcasts) {
            if (mProtectedBroadcasts.contains(actionName)) {
                return true;
            } else if (actionName != null) {
        if (actionName != null) {
            // TODO: remove these terrible hacks
            if (actionName.startsWith("android.net.netmon.lingerExpired")
                    || actionName.startsWith("com.android.server.sip.SipWakeupTimer")
@@ -9569,8 +9565,10 @@ public class PackageManagerService extends IPackageManager.Stub
                return true;
            }
        }
         // allow instant applications
        synchronized (mProtectedBroadcasts) {
            return mProtectedBroadcasts.contains(actionName);
        }
        return false;
    }
    @Override
@@ -15215,9 +15213,10 @@ public class PackageManagerService extends IPackageManager.Stub
                if (DEBUG_PACKAGE_SCANNING) Log.d(TAG, "  Instrumentation: " + r);
            }
            if (!pkg.getProtectedBroadcasts().isEmpty()) {
            final List<String> protectedBroadcasts = pkg.getProtectedBroadcasts();
            if (!protectedBroadcasts.isEmpty()) {
                synchronized (mProtectedBroadcasts) {
                    mProtectedBroadcasts.addAll(pkg.getProtectedBroadcasts());
                    mProtectedBroadcasts.addAll(protectedBroadcasts);
                }
            }