Merge "Update code so it compiles on google3" into ub-now-porkchop

src/com/android/launcher3/Workspace.java

@@ -4869,7 +4869,7 @@ public class Workspace extends SmoothPagedView
     }
 
     public void updatePackageState(ArrayList<PackageInstallInfo> installInfos) {
-        HashSet<String> completedPackages = new HashSet<>();
+        HashSet<String> completedPackages = new HashSet<String>();
 
         for (final PackageInstallInfo installInfo : installInfos) {
             mapOverItems(MAP_RECURSE, new ItemOperator() {

src/com/android/launcher3/compat/PackageInstallerCompatV16.java

@@ -86,7 +86,7 @@ public class PackageInstallerCompatV16 extends PackageInstallerCompat {
             return;
         }
         mReplayPending = false;
-        ArrayList<PackageInstallInfo> updates = new ArrayList<>();
+        ArrayList<PackageInstallInfo> updates = new ArrayList<PackageInstallInfo>();
         for (String packageName: mPrefs.getAll().keySet()) {
             final String json = mPrefs.getString(packageName, null);
             if (!TextUtils.isEmpty(json)) {
@@ -125,7 +125,7 @@ public class PackageInstallerCompatV16 extends PackageInstallerCompat {
                 replayUpdates();
             } else {
                 LauncherAppState app = LauncherAppState.getInstanceNoCreate();
-                ArrayList<PackageInstallInfo> update = new ArrayList<>();
+                ArrayList<PackageInstallInfo> update = new ArrayList<PackageInstallInfo>();
                 update.add(installInfo);
                 sendUpdate(app, update);
             }

src/com/android/launcher3/compat/PackageInstallerCompatVL.java

@@ -33,7 +33,7 @@ public class PackageInstallerCompatVL extends PackageInstallerCompat {
     private static final String TAG = "PackageInstallerCompatVL";
     private static final boolean DEBUG = false;
 
-    private final SparseArray<InstallSessionInfo> mPendingReplays = new SparseArray<>();
+    private final SparseArray<InstallSessionInfo> mPendingReplays = new SparseArray<InstallSessionInfo>();
     private final PackageInstaller mInstaller;
 
     private boolean mResumed;
@@ -97,7 +97,7 @@ public class PackageInstallerCompatVL extends PackageInstallerCompat {
             return;
         }
 
-        ArrayList<PackageInstallInfo> updates = new ArrayList<>();
+        ArrayList<PackageInstallInfo> updates = new ArrayList<PackageInstallInfo>();
         if (newInfo != null) {
             updates.add(newInfo);
         }