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

Commit fb3f3f5b authored by Makoto Onuki's avatar Makoto Onuki Committed by Android (Google) Code Review
Browse files

Merge "Support multi-launcher" into nyc-dev

parents 0b3a9cee de66737a

core/java/android/content/pm/ShortcutInfo.java

+1 −1
Original line number Diff line number Diff line
@@ -524,7 +524,7 @@ public class ShortcutInfo implements Parcelable { 
    }



    /** @hide*/

    public void setFlags(@ShortcutFlags int flags) {

    public void replaceFlags(@ShortcutFlags int flags) {

        mFlags = flags;

    }

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

+321 −54

File changed.

Preview size limit exceeded, changes collapsed.

services/tests/servicestests/src/com/android/server/pm/ShortcutManagerTest.java

+308 −46

File changed.

Preview size limit exceeded, changes collapsed.