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

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

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

Change-Id: I09ffeab660ec3317d7383c070a3767568c84fcb1
parents a08b1698 abadb382

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