Merge changes from topic "presubmit-am-5513fca9a4904e75827e4e4077587542" into tm-mainline-prod am: b6582aa68c

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17614846

Change-Id: Ib7fbe47a5f44e47b5c11ca4e98f22ca62bfc00ab
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Edgar Wang
2022-04-13 05:01:16 +00:00
committed by Automerger Merge Worker

View File

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