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

Commit a3a56ab9 authored by Makoto Onuki's avatar Makoto Onuki Committed by android-build-merger
Browse files

Merge \"ShortcutManager: deal with changing resource IDs on app update\" into nyc-mr1-dev 

am: 3bb43660

Change-Id: Ic2adc036d256a0ad3da4f65a20edfc4cdeb30447
parents 5f3c8684 3bb43660

api/current.txt

+0 −12
Original line number Diff line number Diff line
@@ -10088,19 +10088,7 @@ package android.content.pm { 
    method public boolean isManifestShortcut();

    method public boolean isPinned();

    method public void writeToParcel(android.os.Parcel, int);

    field public static final int CLONE_REMOVE_FOR_CREATOR = 1; // 0x1

    field public static final int CLONE_REMOVE_FOR_LAUNCHER = 3; // 0x3

    field public static final int CLONE_REMOVE_NON_KEY_INFO = 4; // 0x4

    field public static final android.os.Parcelable.Creator<android.content.pm.ShortcutInfo> CREATOR;

    field public static final int FLAG_DISABLED = 64; // 0x40

    field public static final int FLAG_DYNAMIC = 1; // 0x1

    field public static final int FLAG_HAS_ICON_FILE = 8; // 0x8

    field public static final int FLAG_HAS_ICON_RES = 4; // 0x4

    field public static final int FLAG_IMMUTABLE = 256; // 0x100

    field public static final int FLAG_KEY_FIELDS_ONLY = 16; // 0x10

    field public static final int FLAG_MANIFEST = 32; // 0x20

    field public static final int FLAG_PINNED = 2; // 0x2

    field public static final int FLAG_STRINGS_RESOLVED = 128; // 0x80

    field public static final java.lang.String SHORTCUT_CATEGORY_CONVERSATION = "android.shortcut.conversation";

  }

























api/system-current.txt



+0
−12




























Original line number
Diff line number
Diff line








@@ -10511,19 +10511,7 @@ package android.content.pm {













    method public boolean isManifestShortcut();















    method public boolean isPinned();















    method public void writeToParcel(android.os.Parcel, int);













    field public static final int CLONE_REMOVE_FOR_CREATOR = 1; // 0x1













    field public static final int CLONE_REMOVE_FOR_LAUNCHER = 3; // 0x3













    field public static final int CLONE_REMOVE_NON_KEY_INFO = 4; // 0x4















    field public static final android.os.Parcelable.Creator<android.content.pm.ShortcutInfo> CREATOR;













    field public static final int FLAG_DISABLED = 64; // 0x40













    field public static final int FLAG_DYNAMIC = 1; // 0x1













    field public static final int FLAG_HAS_ICON_FILE = 8; // 0x8













    field public static final int FLAG_HAS_ICON_RES = 4; // 0x4













    field public static final int FLAG_IMMUTABLE = 256; // 0x100













    field public static final int FLAG_KEY_FIELDS_ONLY = 16; // 0x10













    field public static final int FLAG_MANIFEST = 32; // 0x20













    field public static final int FLAG_PINNED = 2; // 0x2













    field public static final int FLAG_STRINGS_RESOLVED = 128; // 0x80















    field public static final java.lang.String SHORTCUT_CATEGORY_CONVERSATION = "android.shortcut.conversation";















  }







































api/test-current.txt



+0
−12




























Original line number
Diff line number
Diff line








@@ -10101,19 +10101,7 @@ package android.content.pm {













    method public boolean isManifestShortcut();















    method public boolean isPinned();















    method public void writeToParcel(android.os.Parcel, int);













    field public static final int CLONE_REMOVE_FOR_CREATOR = 1; // 0x1













    field public static final int CLONE_REMOVE_FOR_LAUNCHER = 3; // 0x3













    field public static final int CLONE_REMOVE_NON_KEY_INFO = 4; // 0x4















    field public static final android.os.Parcelable.Creator<android.content.pm.ShortcutInfo> CREATOR;













    field public static final int FLAG_DISABLED = 64; // 0x40













    field public static final int FLAG_DYNAMIC = 1; // 0x1













    field public static final int FLAG_HAS_ICON_FILE = 8; // 0x8













    field public static final int FLAG_HAS_ICON_RES = 4; // 0x4













    field public static final int FLAG_IMMUTABLE = 256; // 0x100













    field public static final int FLAG_KEY_FIELDS_ONLY = 16; // 0x10













    field public static final int FLAG_MANIFEST = 32; // 0x20













    field public static final int FLAG_PINNED = 2; // 0x2













    field public static final int FLAG_STRINGS_RESOLVED = 128; // 0x80















    field public static final java.lang.String SHORTCUT_CATEGORY_CONVERSATION = "android.shortcut.conversation";















  }







































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



+343
−38


























File changed.
Preview size limit exceeded, changes collapsed.
























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



+93
−9


























File changed.
Preview size limit exceeded, changes collapsed.