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

Commit 40fa5117 authored by Pinyao Ting's avatar Pinyao Ting Committed by Automerger Merge Worker
Browse files

Merge "Fix concurrent modification error in ShortcutService" into sc-dev am:... 

Merge "Fix concurrent modification error in ShortcutService" into sc-dev am: 97bedd25 am: 35eeb4e6

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14605994

Change-Id: I1313e5a079e7ce4591d0bc517326bbf8de79ee60
parents 73c95cd0 35eeb4e6

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

+3 −1
Original line number Diff line number Diff line
@@ -1223,8 +1223,10 @@ public class ShortcutService extends IShortcutService.Stub { 
        final String pkg = shortcutInfo.getPackage();

        final int userId = shortcutInfo.getUserId();

        final String id = shortcutInfo.getId();

        synchronized (mLock) {

            getPackageShortcutsLocked(pkg, userId).mutateShortcut(id, shortcutInfo, cb);

        }

    }



    /** Return the last reset time. */

    @GuardedBy("mLock")