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

Commit a150b8b3 authored by Alex Buynytskyy's avatar Alex Buynytskyy
Browse files

Remove everything from under the lock. 

Not sure why this code reported a deadlock, removing everything just in
case.

Bug: 189538295
Test: presubmit
Change-Id: I08f55934fde720819405d1d9868fb77575067327
parent d7d1f3eb

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

+13 −14
Original line number Diff line number Diff line
@@ -9497,11 +9497,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")









@@ -9510,8 +9506,10 @@ public class PackageManagerService extends IPackageManager.Stub













                return true;















            }















        }













         // allow instant applications













        synchronized (mProtectedBroadcasts) {













            return mProtectedBroadcasts.contains(actionName);















        }













        return false;















    }





























    @Override










@@ -15143,9 +15141,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);















                }















            }