1. Replace use of java.util.HashMap with android.util.ArrayMap in

PackageUpdatedTask class
2. Get rid of explicit type arguments that can be inferred

Bug: 62466540
Change-Id: Ifbe4e7d217cea292530f5ced0f4df2ee40c1262c
This commit is contained in:
Rajeev Kumar
2017-06-12 16:20:33 -07:00
parent a1840c6e29
commit 83afc9eda7

View File

@@ -21,8 +21,8 @@ import android.content.Intent;
import android.graphics.Bitmap;
import android.os.Process;
import android.os.UserHandle;
import android.util.ArrayMap;
import android.util.Log;
import com.android.launcher3.AllAppsList;
import com.android.launcher3.AppInfo;
import com.android.launcher3.IconCache;
@@ -30,7 +30,6 @@ import com.android.launcher3.InstallShortcutReceiver;
import com.android.launcher3.ItemInfo;
import com.android.launcher3.LauncherAppState;
import com.android.launcher3.LauncherAppWidgetInfo;
import com.android.launcher3.LauncherModel;
import com.android.launcher3.LauncherModel.CallbackTask;
import com.android.launcher3.LauncherModel.Callbacks;
import com.android.launcher3.LauncherSettings;
@@ -44,14 +43,11 @@ import com.android.launcher3.config.FeatureFlags;
import com.android.launcher3.graphics.LauncherIcons;
import com.android.launcher3.util.FlagOp;
import com.android.launcher3.util.ItemInfoMatcher;
import com.android.launcher3.util.MultiHashMap;
import com.android.launcher3.util.PackageManagerHelper;
import com.android.launcher3.util.PackageUserKey;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Collections;
import java.util.HashMap;
import java.util.HashSet;
/**
@@ -153,7 +149,7 @@ public class PackageUpdatedTask extends ExtendedModelTask {
ArrayList<AppInfo> added = null;
ArrayList<AppInfo> modified = null;
final ArrayList<AppInfo> removedApps = new ArrayList<AppInfo>();
final ArrayList<AppInfo> removedApps = new ArrayList<>();
if (appsList.added.size() > 0) {
added = new ArrayList<>(appsList.added);
@@ -168,7 +164,7 @@ public class PackageUpdatedTask extends ExtendedModelTask {
appsList.removed.clear();
}
final HashMap<ComponentName, AppInfo> addedOrUpdatedApps = new HashMap<>();
final ArrayMap<ComponentName, AppInfo> addedOrUpdatedApps = new ArrayMap<>();
if (added != null) {
final ArrayList<AppInfo> addedApps = added;