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

This commit is contained in:
Winson Chiu
2020-06-25 23:18:36 +00:00
committed by Android (Google) Code Review

View File

@@ -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();
} }