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

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

Merge "Validate userId when publishing shortcuts" into rvc-dev

parents 61621c95 01bfd04f

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

+4 −0
Original line number Diff line number Diff line
@@ -1642,6 +1642,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(