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

Commit 1cf1b7d4 authored by Pinyao Ting's avatar Pinyao Ting Committed by Android Build Coastguard Worker
Browse files

Validate userId when publishing shortcuts 

Bug: 288110451
Test: manual
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:01bfd04ff445db6290ae430d44ea1bf1a115fe3c)
Merged-In: Idbde676f871db83825155730e3714f3727e25762
Change-Id: Idbde676f871db83825155730e3714f3727e25762
parent 825a59b3

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

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