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

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

Merge "ShortcutManager: add remaining APIs." into nyc-dev am: 4a07c34c 

am: 027fd0ae

* commit '027fd0ae':
  ShortcutManager: add remaining APIs.
parents f5122c1e 027fd0ae

api/current.txt

+3 −1
Original line number Diff line number Diff line
@@ -9998,6 +9998,7 @@ package android.content.pm { 
    method public int getWeight();

    method public boolean hasIconFile();

    method public boolean hasIconResource();

    method public boolean hasKeyFieldsOnly();

    method public boolean isDynamic();

    method public boolean isPinned();

    method public void writeToParcel(android.os.Parcel, int);
@@ -10008,6 +10009,7 @@ package android.content.pm { 
    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_KEY_FIELDS_ONLY = 16; // 0x10

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

  }









@@ -10028,6 +10030,7 @@ package android.content.pm {













    method public void deleteAllDynamicShortcuts();















    method public void deleteDynamicShortcut(java.lang.String);















    method public java.util.List<android.content.pm.ShortcutInfo> getDynamicShortcuts();













    method public int getIconMaxDimensions();















    method public int getMaxDynamicShortcutCount();















    method public java.util.List<android.content.pm.ShortcutInfo> getPinnedShortcuts();















    method public long getRateLimitResetTime();










@@ -29035,7 +29038,6 @@ package android.os {













    ctor public PersistableBundle();















    ctor public PersistableBundle(int);















    ctor public PersistableBundle(android.os.PersistableBundle);













    ctor public PersistableBundle(android.os.Bundle);















    method public java.lang.Object clone();















    method public android.os.PersistableBundle deepcopy();















    method public int describeContents();

























api/system-current.txt



+3
−1




























Original line number
Diff line number
Diff line








@@ -10392,6 +10392,7 @@ package android.content.pm {













    method public int getWeight();















    method public boolean hasIconFile();















    method public boolean hasIconResource();













    method public boolean hasKeyFieldsOnly();















    method public boolean isDynamic();















    method public boolean isPinned();















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









@@ -10402,6 +10403,7 @@ package android.content.pm {













    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_KEY_FIELDS_ONLY = 16; // 0x10















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















  }























@@ -10422,6 +10424,7 @@ package android.content.pm {













    method public void deleteAllDynamicShortcuts();















    method public void deleteDynamicShortcut(java.lang.String);















    method public java.util.List<android.content.pm.ShortcutInfo> getDynamicShortcuts();













    method public int getIconMaxDimensions();















    method public int getMaxDynamicShortcutCount();















    method public java.util.List<android.content.pm.ShortcutInfo> getPinnedShortcuts();















    method public long getRateLimitResetTime();










@@ -31315,7 +31318,6 @@ package android.os {













    ctor public PersistableBundle();















    ctor public PersistableBundle(int);















    ctor public PersistableBundle(android.os.PersistableBundle);













    ctor public PersistableBundle(android.os.Bundle);















    method public java.lang.Object clone();















    method public android.os.PersistableBundle deepcopy();















    method public int describeContents();

























api/test-current.txt



+3
−1




























Original line number
Diff line number
Diff line








@@ -10008,6 +10008,7 @@ package android.content.pm {













    method public int getWeight();















    method public boolean hasIconFile();















    method public boolean hasIconResource();













    method public boolean hasKeyFieldsOnly();















    method public boolean isDynamic();















    method public boolean isPinned();















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









@@ -10018,6 +10019,7 @@ package android.content.pm {













    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_KEY_FIELDS_ONLY = 16; // 0x10















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















  }























@@ -10038,6 +10040,7 @@ package android.content.pm {













    method public void deleteAllDynamicShortcuts();















    method public void deleteDynamicShortcut(java.lang.String);















    method public java.util.List<android.content.pm.ShortcutInfo> getDynamicShortcuts();













    method public int getIconMaxDimensions();















    method public int getMaxDynamicShortcutCount();















    method public java.util.List<android.content.pm.ShortcutInfo> getPinnedShortcuts();















    method public long getRateLimitResetTime();










@@ -29101,7 +29104,6 @@ package android.os {













    ctor public PersistableBundle();















    ctor public PersistableBundle(int);















    ctor public PersistableBundle(android.os.PersistableBundle);













    ctor public PersistableBundle(android.os.Bundle);















    method public java.lang.Object clone();















    method public android.os.PersistableBundle deepcopy();















    method public int describeContents();

























core/java/android/app/SystemServiceRegistry.java



+5
−6




























Original line number
Diff line number
Diff line








@@ -756,8 +756,7 @@ final class SystemServiceRegistry {













            @Override















            public ShortcutManager createService(ContextImpl ctx) {















                IBinder b = ServiceManager.getService(Context.SHORTCUT_SERVICE);













                        return new ShortcutManager(ctx,













                                IShortcutService.Stub.asInterface(b));













                return new ShortcutManager(ctx, IShortcutService.Stub.asInterface(b));















            }});















    }

















































core/java/android/content/pm/ILauncherApps.aidl



+6
−0




























Original line number
Diff line number
Diff line








@@ -26,6 +26,8 @@ import android.content.pm.ShortcutInfo;













import android.graphics.Rect;















import android.os.Bundle;















import android.os.UserHandle;













import android.os.ParcelFileDescriptor;





























import java.util.List;































/**









@@ -52,4 +54,8 @@ interface ILauncherApps {













            in UserHandle user);















    boolean startShortcut(String callingPackage, String packageName, String id,















            in Rect sourceBounds, in Bundle startActivityOptions, in UserHandle user);



























    int getShortcutIconResId(String callingPackage, in ShortcutInfo shortcut, in UserHandle user);













    ParcelFileDescriptor getShortcutIconFd(String callingPackage, in ShortcutInfo shortcut,













            in UserHandle user);















}