summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Winson Chiu <chiuwinson@google.com> 2020-06-25 23:18:36 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 2020-06-25 23:18:36 +0000
commita57d8ae57f9361c969fcc6308a1549e3a6455533 (patch)
tree45381822e81e5e3a111e30db484ba7e2f5fc72ef
parent0ab8762cf673bae787e0315bb37a00b209392185 (diff)
parent3e46d7e1a16f04e3624a93907e99cc400a230535 (diff)
Merge "Revert "Ignores protected broadcasts if not priv-app"" into rvc-dev
-rw-r--r--services/core/java/com/android/server/pm/PackageManagerService.java3
1 files changed, 2 insertions, 1 deletions
diff --git a/services/core/java/com/android/server/pm/PackageManagerService.java b/services/core/java/com/android/server/pm/PackageManagerService.java
index a9d3a07b4e68..088c5daf30a4 100644
--- a/services/core/java/com/android/server/pm/PackageManagerService.java
+++ b/services/core/java/com/android/server/pm/PackageManagerService.java
@@ -11733,6 +11733,8 @@ public class PackageManagerService extends IPackageManager.Stub
}
} else {
parsedPackage
+ // Non system apps cannot mark any broadcast as protected
+ .clearProtectedBroadcasts()
// non system apps can't be flagged as core
.setCoreApp(false)
// clear flags not applicable to regular apps
@@ -11744,7 +11746,6 @@ public class PackageManagerService extends IPackageManager.Stub
}
if ((scanFlags & SCAN_AS_PRIVILEGED) == 0) {
parsedPackage
- .clearProtectedBroadcasts()
.markNotActivitiesAsNotExportedIfSingleUser();
}