Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Remove everything from under the lock." into sc-dev

Browse Source
This commit is contained in:
TreeHugger Robot
2021-06-08 02:25:46 +00:00
committed by Android (Google) Code Review
parent 42a28cc951 a150b8b369
commit 4895062eac
1 changed files with 13 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
services/core/java/com/android/server/pm/PackageManagerService.java
View File

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