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

Commit 2662c0f8 authored by Winson Chiu's avatar Winson Chiu Committed by Automerger Merge Worker
Browse files

Merge "Revert "Ignores protected broadcasts if not priv-app"" into rvc-dev am: a57d8ae5 

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11886052

Change-Id: Ibcf3c6bd138f34f82b3e00ee89646e97e854b890
parents ab1879c7 a57d8ae5

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

+2 −1
Original line number Original line Diff line number Diff line
@@ -11733,6 +11733,8 @@ public class PackageManagerService extends IPackageManager.Stub 
            }

            }

        } else {

        } else {

            parsedPackage

            parsedPackage

                    // Non system apps cannot mark any broadcast as protected

                    .clearProtectedBroadcasts()

                    // non system apps can't be flagged as core

                    // non system apps can't be flagged as core

                    .setCoreApp(false)

                    .setCoreApp(false)

                    // clear flags not applicable to regular apps

                    // clear flags not applicable to regular apps
@@ -11744,7 +11746,6 @@ public class PackageManagerService extends IPackageManager.Stub 
        }

        }

        if ((scanFlags & SCAN_AS_PRIVILEGED) == 0) {

        if ((scanFlags & SCAN_AS_PRIVILEGED) == 0) {

            parsedPackage

            parsedPackage

                    .clearProtectedBroadcasts()

                    .markNotActivitiesAsNotExportedIfSingleUser();

                    .markNotActivitiesAsNotExportedIfSingleUser();

        }

        }