commit 513edaebce9846c2d5eb4c0c013a9dcf6232c0e3
author Sameer Padala <sxp@google.com> Tue Jul 29 16:17:08 2014 -0700
committer Sameer Padala <sxp@google.com> Tue Jul 29 16:17:08 2014 -0700
tree 5675775dc748a3689d2f822229beb06034ba3f5f
parent 04c969ef9f5b328ffa0454573a93bbcf7f894854

Modify code so it compiles on google3

The diamond operator isn't supported on google3 Android projects.

Change-Id: Ie7298b051330bb2cd32426d4c537882faa2f8ebd

src/com/android/launcher3/LauncherModel.java

diff --git a/src/com/android/launcher3/LauncherModel.java b/src/com/android/launcher3/LauncherModel.java
index 6e5832a..e115bf1 100644
--- a/src/com/android/launcher3/LauncherModel.java
+++ b/src/com/android/launcher3/LauncherModel.java
@@ -166,7 +166,8 @@
     static final ArrayList<Long> sBgWorkspaceScreens = new ArrayList<Long>();
 
     // sPendingPackages is a set of packages which could be on sdcard and are not available yet
-    static final HashMap<UserHandleCompat, HashSet<String>> sPendingPackages = new HashMap<>();
+    static final HashMap<UserHandleCompat, HashSet<String>> sPendingPackages =
+            new HashMap<UserHandleCompat, HashSet<String>>();
 
     // </ only access in worker thread >
 
@@ -1988,7 +1989,7 @@
                                                     + " (check again later)", true);
                                             HashSet<String> pkgs = sPendingPackages.get(user);
                                             if (pkgs == null) {
-                                                pkgs = new HashSet<>();
+                                                pkgs = new HashSet<String>();
                                                 sPendingPackages.put(user, pkgs);
                                             }
                                             pkgs.add(cn.getPackageName());
@@ -2826,7 +2827,7 @@
                 ArrayList<String> packagesRemoved;
                 for (Entry<UserHandleCompat, HashSet<String>> entry : sPendingPackages.entrySet()) {
                     UserHandleCompat user = entry.getKey();
-                    packagesRemoved = new ArrayList<>();
+                    packagesRemoved = new ArrayList<String>();
                     for (String pkg : entry.getValue()) {
                         if (!launcherApps.isPackageEnabledForProfile(pkg, user)) {
                             Launcher.addDumpLog(TAG, "Package not found: " + pkg, true);