Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit f63adb20 authored by Winson Chiu's avatar Winson Chiu Committed by Android (Google) Code Review
Browse files

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

parents d28d2e48 e1843e8a

services/core/java/com/android/server/pm/PackageManagerService.java

+2 −2
Original line number Diff line number Diff line
@@ -11608,6 +11608,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) {
@@ -11616,8 +11618,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) {