diff options
| author | Winson Chiu <chiuwinson@google.com> | 2020-06-16 21:41:22 +0000 |
|---|---|---|
| committer | Anis Assi <anisassi@google.com> | 2020-06-30 16:11:43 -0700 |
| commit | c69f445dc10b63e52f019aaafcb816293987935d (patch) | |
| tree | d7a8477a551fe9b2b19a253d436236eb7eb97bcb | |
| parent | e97019f81c8ab40a610480324a23b6e4273700f7 (diff) | |
| download | base-android-9.0.0_r60.tar.gz | |
Revert "Ignores protected broadcasts if not priv-app"android-9.0.0_r60
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
(cherry picked from commit b5e3addc5f27149d1b0bbc213ced47b2ade732bf)
| -rw-r--r-- | services/core/java/com/android/server/pm/PackageManagerService.java | 4 |
1 files 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 bc1a49ce85cb..4fad530d1431 100644 --- a/services/core/java/com/android/server/pm/PackageManagerService.java +++ b/services/core/java/com/android/server/pm/PackageManagerService.java @@ -10873,6 +10873,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) { @@ -10881,8 +10883,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) { |