diff options
| author | Tony Wickham <twickham@google.com> | 2017-04-05 13:14:01 -0700 |
|---|---|---|
| committer | Tony Wickham <twickham@google.com> | 2017-04-05 13:14:01 -0700 |
| commit | 6c300c89ecbac04c557a4695b1597ed35150f420 (patch) | |
| tree | 086e9d50f1914a021267b61be27fab1f06803cb5 /src/com/android/launcher3/compat/LauncherAppsCompat.java | |
| parent | 2dbcfb6cb01ebf7563810aa0b7f1c6638053faed (diff) | |
| parent | 128b7e59a12ae861be81adb38c3eb9ccde61c6b5 (diff) | |
| download | android_packages_apps_Trebuchet-6c300c89ecbac04c557a4695b1597ed35150f420.tar.gz android_packages_apps_Trebuchet-6c300c89ecbac04c557a4695b1597ed35150f420.tar.bz2 android_packages_apps_Trebuchet-6c300c89ecbac04c557a4695b1597ed35150f420.zip | |
resolve merge conflicts of 128b7e59a to ub-launcher3-master
Test: I solemnly swear I tested this conflict resolution.
Change-Id: I927373593dfb1b67b504a76b1ad013357b363a6e
Diffstat (limited to 'src/com/android/launcher3/compat/LauncherAppsCompat.java')
| -rw-r--r-- | src/com/android/launcher3/compat/LauncherAppsCompat.java | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/com/android/launcher3/compat/LauncherAppsCompat.java b/src/com/android/launcher3/compat/LauncherAppsCompat.java index b03a302ee..01d0e1784 100644 --- a/src/com/android/launcher3/compat/LauncherAppsCompat.java +++ b/src/com/android/launcher3/compat/LauncherAppsCompat.java @@ -33,6 +33,7 @@ import com.android.launcher3.Utilities; import com.android.launcher3.graphics.LauncherIcons; import com.android.launcher3.shortcuts.ShortcutInfoCompat; import com.android.launcher3.util.LooperExecutor; +import com.android.launcher3.util.PackageUserKey; import java.util.List; @@ -83,7 +84,8 @@ public abstract class LauncherAppsCompat { public abstract boolean isPackageEnabledForProfile(String packageName, UserHandle user); public abstract boolean isActivityEnabledForProfile(ComponentName component, UserHandle user); - public abstract List<ShortcutConfigActivityInfo> getCustomShortcutActivityList(); + public abstract List<ShortcutConfigActivityInfo> getCustomShortcutActivityList( + @Nullable PackageUserKey packageUser); /** * request.accept() will initiate the following flow: |