Merge "Revert "Ignores protected broadcasts if not priv-app"" into rvc-dev (a57d8ae5) · Commits · e / os / android_frameworks_base

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