Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
Change-Id: I57f0ae09ff9ab3a90b95ffe1ea57d35ce94d7591
This commit is contained in:
Automerger Merge Worker
2020-03-17 17:22:31 +00:00
parent 5de429c9a4 adb0244865
commit 0d2d0634eb
3 changed files with 1 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
api/current.txt
View File

@@ -11721,6 +11721,7 @@ package android.content.pm {
ctor public LauncherApps.ShortcutQuery(); ctor public LauncherApps.ShortcutQuery();
method public android.content.pm.LauncherApps.ShortcutQuery setActivity(@Nullable android.content.ComponentName); method public android.content.pm.LauncherApps.ShortcutQuery setActivity(@Nullable android.content.ComponentName);
method public android.content.pm.LauncherApps.ShortcutQuery setChangedSince(long); 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 setPackage(@Nullable String);
method public android.content.pm.LauncherApps.ShortcutQuery setQueryFlags(int); method public android.content.pm.LauncherApps.ShortcutQuery setQueryFlags(int);
method public android.content.pm.LauncherApps.ShortcutQuery setShortcutIds(@Nullable java.util.List<java.lang.String>); method public android.content.pm.LauncherApps.ShortcutQuery setShortcutIds(@Nullable java.util.List<java.lang.String>);

4
api/system-current.txt
View File

@@ -2102,10 +2102,6 @@ package android.content.pm {
field @NonNull public static final android.os.Parcelable.Creator<android.content.pm.LauncherApps.AppUsageLimit> CREATOR; 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 { public class PackageInstaller {
method @RequiresPermission(android.Manifest.permission.INSTALL_PACKAGES) public void setPermissionsResult(int, boolean); method @RequiresPermission(android.Manifest.permission.INSTALL_PACKAGES) public void setPermissionsResult(int, boolean);
field public static final int DATA_LOADER_TYPE_INCREMENTAL = 2; // 0x2 field public static final int DATA_LOADER_TYPE_INCREMENTAL = 2; // 0x2

3
core/java/android/content/pm/LauncherApps.java
View File

@@ -460,10 +460,7 @@ public class LauncherApps {
/** /**
* If non-null, return only the specified shortcuts by locus ID. When setting this field, * 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}. * a package name must also be set with {@link #setPackage}.
*
* @hide
*/ */
@SystemApi
@NonNull @NonNull
public ShortcutQuery setLocusIds(@Nullable List<LocusId> locusIds) { public ShortcutQuery setLocusIds(@Nullable List<LocusId> locusIds) {
mLocusIds = locusIds; mLocusIds = locusIds;