Merge "QS Edit: Fix drag to add tiles going away" into nyc-dev am: dea7075

am: ad0680d

* commit 'ad0680d6ea38ac2b74c56e4d0bf6c1ab9e4c544d':
  QS Edit: Fix drag to add tiles going away

Change-Id: I81cba7ba19e3a610a23114d4598c3b9f3e848c2c

packages/SystemUI/src/com/android/systemui/qs/customize/TileAdapter.java

@@ -387,7 +387,7 @@ public class TileAdapter extends RecyclerView.Adapter<Holder> implements TileSta
                 }
             }
         }
-        if (mTiles.get(mTiles.size() - 1) == null) {
+        if (mTiles.size() - 1 == mTileDividerIndex) {
             mTiles.remove(mTiles.size() - 1);
         }
     }