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

Merge "Revert "Ignores protected broadcasts if not priv-app"" into qt-dev

Browse Source
This commit is contained in:
Winson Chiu
2020-06-26 18:36:22 +00:00
committed by Android (Google) Code Review
parent d28d2e4858 e1843e8a1f
commit f63adb20f6
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

@@ -11608,6 +11608,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) {
@@ -11616,8 +11618,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) {