From 90664488b427cf0e4c96c3077de36d3106a3956a Mon Sep 17 00:00:00 2001 From: Marcello Galhardo Date: Tue, 18 Apr 2023 16:13:38 +0000 Subject: [PATCH] Allow System to by-pass `verifyShortcutInfoPackage` SystemUI needs to be able to modify shortcuts defined by other System Apps. A clear use case is Note Task shortcut which needs to be updated based on the notes role app which is observed from SystemUI. Test: manual Fixes: b/278724068 Change-Id: Iaca0e6a13ecb68f856334fd83947ac721d45ff81 --- .../core/java/com/android/server/pm/ShortcutService.java | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/services/core/java/com/android/server/pm/ShortcutService.java b/services/core/java/com/android/server/pm/ShortcutService.java index b669ba2388804..84a9888d24589 100644 --- a/services/core/java/com/android/server/pm/ShortcutService.java +++ b/services/core/java/com/android/server/pm/ShortcutService.java @@ -1716,6 +1716,11 @@ public class ShortcutService extends IShortcutService.Stub { if (si == null) { return; } + + if (isCallerSystem()) { + return; // no check + } + if (!Objects.equals(callerPackage, si.getPackage())) { android.util.EventLog.writeEvent(0x534e4554, "109824443", -1, ""); throw new SecurityException("Shortcut package name mismatch");