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

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

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

parents 07791ca5 018017e2

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

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

        final String pkg = shortcutInfo.getPackage();

        final int userId = shortcutInfo.getUserId();

        final int userId = shortcutInfo.getUserId();

        final String id = shortcutInfo.getId();

        final String id = shortcutInfo.getId();

        synchronized (mLock) {

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

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

        }

        }

    }





    /** Return the last reset time. */

    /** Return the last reset time. */

    @GuardedBy("mLock")

    @GuardedBy("mLock")