diff options
author | Rajeev Kumar <rajekumar@google.com> | 2017-06-22 17:19:24 +0000 |
---|---|---|
committer | Android (Google) Code Review <android-gerrit@google.com> | 2017-06-22 17:19:24 +0000 |
commit | 50db3ad437e20730d60c2da4eee83e04444e1c0b (patch) | |
tree | f7d12459355977a641caf09968b814905a131c09 /src/com/android | |
parent | 2ed2bed9638661591913d6ababf0cfb2f16ad035 (diff) | |
parent | f75faf80368d3e759730f269708ab494f1fd6b24 (diff) | |
download | android_packages_apps_Trebuchet-50db3ad437e20730d60c2da4eee83e04444e1c0b.tar.gz android_packages_apps_Trebuchet-50db3ad437e20730d60c2da4eee83e04444e1c0b.tar.bz2 android_packages_apps_Trebuchet-50db3ad437e20730d60c2da4eee83e04444e1c0b.zip |
Merge "1. Replace use of java.util.HashMap with android.util.ArrayMap in LauncherAppsCompatVL class. 2. Fix Synchronization on a non-final field 'mCallbacks'. 3. Add missing @Override to the overriden methods. 4. Add missing @NonNull to the method parameters. Bug: 62466540" into ub-launcher3-dorval-polish
Diffstat (limited to 'src/com/android')
-rw-r--r-- | src/com/android/launcher3/compat/LauncherAppsCompatVL.java | 24 |
1 files changed, 16 insertions, 8 deletions
diff --git a/src/com/android/launcher3/compat/LauncherAppsCompatVL.java b/src/com/android/launcher3/compat/LauncherAppsCompatVL.java index 647c31593..cc3e5a727 100644 --- a/src/com/android/launcher3/compat/LauncherAppsCompatVL.java +++ b/src/com/android/launcher3/compat/LauncherAppsCompatVL.java @@ -29,23 +29,22 @@ import android.graphics.Rect; import android.os.Bundle; import android.os.Process; import android.os.UserHandle; +import android.support.annotation.NonNull; import android.support.annotation.Nullable; - +import android.util.ArrayMap; import com.android.launcher3.compat.ShortcutConfigActivityInfo.ShortcutConfigActivityInfoVL; import com.android.launcher3.shortcuts.ShortcutInfoCompat; import com.android.launcher3.util.PackageUserKey; - import java.util.ArrayList; -import java.util.HashMap; import java.util.List; -import java.util.Map; public class LauncherAppsCompatVL extends LauncherAppsCompat { protected final LauncherApps mLauncherApps; protected final Context mContext; - private Map<OnAppsChangedCallbackCompat, WrappedCallback> mCallbacks = new HashMap<>(); + private final ArrayMap<OnAppsChangedCallbackCompat, WrappedCallback> mCallbacks = + new ArrayMap<>(); LauncherAppsCompatVL(Context context) { mContext = context; @@ -131,43 +130,52 @@ public class LauncherAppsCompatVL extends LauncherAppsCompat { } private static class WrappedCallback extends LauncherApps.Callback { - private LauncherAppsCompat.OnAppsChangedCallbackCompat mCallback; + private final LauncherAppsCompat.OnAppsChangedCallbackCompat mCallback; public WrappedCallback(LauncherAppsCompat.OnAppsChangedCallbackCompat callback) { mCallback = callback; } + @Override public void onPackageRemoved(String packageName, UserHandle user) { mCallback.onPackageRemoved(packageName, user); } + @Override public void onPackageAdded(String packageName, UserHandle user) { mCallback.onPackageAdded(packageName, user); } + @Override public void onPackageChanged(String packageName, UserHandle user) { mCallback.onPackageChanged(packageName, user); } + @Override public void onPackagesAvailable(String[] packageNames, UserHandle user, boolean replacing) { mCallback.onPackagesAvailable(packageNames, user, replacing); } + @Override public void onPackagesUnavailable(String[] packageNames, UserHandle user, boolean replacing) { mCallback.onPackagesUnavailable(packageNames, user, replacing); } + @Override public void onPackagesSuspended(String[] packageNames, UserHandle user) { mCallback.onPackagesSuspended(packageNames, user); } + @Override public void onPackagesUnsuspended(String[] packageNames, UserHandle user) { mCallback.onPackagesUnsuspended(packageNames, user); } - public void onShortcutsChanged(String packageName, List<ShortcutInfo> shortcuts, - UserHandle user) { + @Override + public void onShortcutsChanged(@NonNull String packageName, + @NonNull List<ShortcutInfo> shortcuts, + @NonNull UserHandle user) { List<ShortcutInfoCompat> shortcutInfoCompats = new ArrayList<>(shortcuts.size()); for (ShortcutInfo shortcutInfo : shortcuts) { shortcutInfoCompats.add(new ShortcutInfoCompat(shortcutInfo)); |