Merge cherrypicks of [17730679] into sc-qpr3-release.

Change-Id: I09ffeab660ec3317d7383c070a3767568c84fcb1
This commit is contained in:
Android Build Coastguard Worker
2022-05-16 21:13:30 +00:00

View File

@@ -661,10 +661,7 @@ public class AppRestrictionsFragment extends SettingsPreferenceFragment implemen
} }
private void assertSafeToStartCustomActivity(Intent intent) { private void assertSafeToStartCustomActivity(Intent intent) {
// Activity can be started if it belongs to the same app EventLog.writeEvent(0x534e4554, "223578534", -1 /* UID */, "");
if (intent.getPackage() != null && intent.getPackage().equals(packageName)) {
return;
}
ResolveInfo resolveInfo = mPackageManager.resolveActivity( ResolveInfo resolveInfo = mPackageManager.resolveActivity(
intent, PackageManager.MATCH_DEFAULT_ONLY); intent, PackageManager.MATCH_DEFAULT_ONLY);