| commit | 024fe4b39a58ea7aec601f0eea93085ce090c161 | [log] [tgz] |
|---|---|---|
| author | Xin Li <delphij@google.com> | Tue Apr 19 00:08:18 2022 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Tue Apr 19 00:08:18 2022 +0000 |
| tree | ee0f08d4178ef6e48906f131298850287ef64c03 | |
| parent | 6296df10dac5adc8da9354099510c96d8d00fda7 [diff] | |
| parent | 99d834b0b848777acb3f04c8e30e4ccc833c14e2 [diff] |
[automerger skipped] Merge sc-v2-dev-plus-aosp-without-vendor@8433047 am: 99d834b0b8 -s ours am skip reason: Merged-In I800f0f39a469a95eb36eeaaeb2aa60a39fd916d3 with SHA-1 d0a23dc840 is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17805671 Change-Id: Ia9158c51f249227851e314b45566de1f7bfec848 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
diff --git a/src/com/android/settings/users/AppRestrictionsFragment.java b/src/com/android/settings/users/AppRestrictionsFragment.java index c67a687..db7612f 100644 --- a/src/com/android/settings/users/AppRestrictionsFragment.java +++ b/src/com/android/settings/users/AppRestrictionsFragment.java
@@ -661,10 +661,7 @@ } 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);