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

Revert "Ignores protected broadcasts if not priv-app"

Browse Source 
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
This commit is contained in:
Winson Chiu
2020-06-16 21:41:22 +00:00
parent 44654288c0
commit 860fd4b6a2
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -11657,6 +11657,8 @@ public class PackageManagerService extends IPackageManager.Stub
~ApplicationInfo.PRIVATE_FLAG_DEFAULT_TO_DEVICE_PROTECTED_STORAGE; ~ApplicationInfo.PRIVATE_FLAG_DEFAULT_TO_DEVICE_PROTECTED_STORAGE;
pkg.applicationInfo.privateFlags &= pkg.applicationInfo.privateFlags &=
~ApplicationInfo.PRIVATE_FLAG_DIRECT_BOOT_AWARE; ~ApplicationInfo.PRIVATE_FLAG_DIRECT_BOOT_AWARE;
// clear protected broadcasts
pkg.protectedBroadcasts = null;
// cap permission priorities // cap permission priorities
if (pkg.permissionGroups != null && pkg.permissionGroups.size() > 0) { if (pkg.permissionGroups != null && pkg.permissionGroups.size() > 0) {
for (int i = pkg.permissionGroups.size() - 1; i >= 0; --i) { for (int i = pkg.permissionGroups.size() - 1; i >= 0; --i) {
@@ -11665,8 +11667,6 @@ public class PackageManagerService extends IPackageManager.Stub
} }
} }
if ((scanFlags & SCAN_AS_PRIVILEGED) == 0) { if ((scanFlags & SCAN_AS_PRIVILEGED) == 0) {
// clear protected broadcasts
pkg.protectedBroadcasts = null;
// ignore export request for single user receivers // ignore export request for single user receivers
if (pkg.receivers != null) { if (pkg.receivers != null) {
for (int i = pkg.receivers.size() - 1; i >= 0; --i) { for (int i = pkg.receivers.size() - 1; i >= 0; --i) {