Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit e0722bee authored by Android Build Coastguard Worker's avatar Android Build Coastguard Worker
Browse files

Merge cherrypicks of [17730675] into security-aosp-rvc-release.

Change-Id: Ibfd2224e00e813d90ece4174dce3e2c1a25f9da9
parents 3c885237 96b1691c
Loading
Loading
Loading
Loading
+1 −4
Original line number Diff line number Diff line
@@ -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);