From b5e3addc5f27149d1b0bbc213ced47b2ade732bf Mon Sep 17 00:00:00 2001 From: Winson Chiu Date: Tue, 16 Jun 2020 21:41:22 +0000 Subject: Revert "Ignores protected broadcasts if not priv-app" Revert of I5bd2bf3bd7c38fd9cc563a02b24bc569495d79ed For now, allow all system apps to declare protected broadcasts. This will be cleaned up in a future change. Bug: 158570769 Merged-In: I54d236c0a6daaa934bd64a3bd05e2654e0e868fe Change-Id: I54d236c0a6daaa934bd64a3bd05e2654e0e868fe --- services/core/java/com/android/server/pm/PackageManagerService.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/services/core/java/com/android/server/pm/PackageManagerService.java b/services/core/java/com/android/server/pm/PackageManagerService.java index 46f2de4404a8..2093438dfbb3 100644 --- a/services/core/java/com/android/server/pm/PackageManagerService.java +++ b/services/core/java/com/android/server/pm/PackageManagerService.java @@ -10837,6 +10837,8 @@ public class PackageManagerService extends IPackageManager.Stub ~ApplicationInfo.PRIVATE_FLAG_DEFAULT_TO_DEVICE_PROTECTED_STORAGE; pkg.applicationInfo.privateFlags &= ~ApplicationInfo.PRIVATE_FLAG_DIRECT_BOOT_AWARE; + // clear protected broadcasts + pkg.protectedBroadcasts = null; // cap permission priorities if (pkg.permissionGroups != null && pkg.permissionGroups.size() > 0) { for (int i = pkg.permissionGroups.size() - 1; i >= 0; --i) { @@ -10845,8 +10847,6 @@ public class PackageManagerService extends IPackageManager.Stub } } if ((scanFlags & SCAN_AS_PRIVILEGED) == 0) { - // clear protected broadcasts - pkg.protectedBroadcasts = null; // ignore export request for single user receivers if (pkg.receivers != null) { for (int i = pkg.receivers.size() - 1; i >= 0; --i) { -- cgit v1.2.3-59-g8ed1b