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

Commit 057185cd authored by Pinyao Ting's avatar Pinyao Ting Committed by Android (Google) Code Review
Browse files

Merge "Validate userId when publishing shortcuts" into main

parents eb9d4d3d 4a12c242

services/core/java/com/android/server/pm/ShortcutService.java

+4 −0
Original line number Diff line number Diff line
@@ -1743,6 +1743,10 @@ public class ShortcutService extends IShortcutService.Stub { 
            android.util.EventLog.writeEvent(0x534e4554, "109824443", -1, "");

            throw new SecurityException("Shortcut package name mismatch");

        }

        final int callingUid = injectBinderCallingUid();

        if (UserHandle.getUserId(callingUid) != si.getUserId()) {

            throw new SecurityException("User-ID in shortcut doesn't match the caller");

        }

    }



    private void verifyShortcutInfoPackages(