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

Commit c73b07dc authored by Bill Yi's avatar Bill Yi
Browse files

Merge SQ3A.220705.003 to aosp-master - DO NOT MERGE 

Merged-In: I5ea05490d13515baaeda9ea7b6c153c8c2d0a54e
Merged-In: I7a2a0e8da3ae59219e9984e8437ce0b1e007bce2
Change-Id: I677947b60b051c89293ca58359cb56b8cbc63ec8
parents e27d1790 e8742ebc

src/com/android/settings/users/AppRestrictionsFragment.java

+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);