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

Commit 05ec6c27 authored by Automerger Merge Worker's avatar Automerger Merge Worker
Browse files

Merge "Make LauncherApps#ShortcutQuery#setLocusId() public" into rvc-dev am:... 

Merge "Make LauncherApps#ShortcutQuery#setLocusId() public" into rvc-dev am: bcaa266f am: adb02448 am: 0d2d0634

Change-Id: I1aac8725c492d8de6de365cc53f070127cfefb50
parents 4c7da21a 0d2d0634

api/current.txt

+1 −0
Original line number Diff line number Diff line
@@ -11721,6 +11721,7 @@ package android.content.pm { 
    ctor public LauncherApps.ShortcutQuery();

    method public android.content.pm.LauncherApps.ShortcutQuery setActivity(@Nullable android.content.ComponentName);

    method public android.content.pm.LauncherApps.ShortcutQuery setChangedSince(long);

    method @NonNull public android.content.pm.LauncherApps.ShortcutQuery setLocusIds(@Nullable java.util.List<android.content.LocusId>);

    method public android.content.pm.LauncherApps.ShortcutQuery setPackage(@Nullable String);

    method public android.content.pm.LauncherApps.ShortcutQuery setQueryFlags(int);

    method public android.content.pm.LauncherApps.ShortcutQuery setShortcutIds(@Nullable java.util.List<java.lang.String>);

api/system-current.txt

+0 −4
Original line number Diff line number Diff line
@@ -2102,10 +2102,6 @@ package android.content.pm { 
    field @NonNull public static final android.os.Parcelable.Creator<android.content.pm.LauncherApps.AppUsageLimit> CREATOR;

  }













  public static class LauncherApps.ShortcutQuery {













    method @NonNull public android.content.pm.LauncherApps.ShortcutQuery setLocusIds(@Nullable java.util.List<android.content.LocusId>);













  }



























  public class PackageInstaller {















    method @RequiresPermission(android.Manifest.permission.INSTALL_PACKAGES) public void setPermissionsResult(int, boolean);















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

































core/java/android/content/pm/LauncherApps.java



+0
−3




























Original line number
Diff line number
Diff line








@@ -460,10 +460,7 @@ public class LauncherApps {













        /**















         * If non-null, return only the specified shortcuts by locus ID.  When setting this field,















         * a package name must also be set with {@link #setPackage}.













         *













         * @hide















         */













        @SystemApi















        @NonNull















        public ShortcutQuery setLocusIds(@Nullable List<LocusId> locusIds) {















            mLocusIds = locusIds;