Merge "Tie ContextualWifiSlice to UI instead of garbage collector"

tests/robotests/src/com/android/settings/slices/SettingsSliceProviderTest.java

@@ -135,7 +135,6 @@ public class SettingsSliceProviderTest {
         mProvider.mSliceWeakDataCache = new HashMap<>();
         mProvider.mSliceDataCache = new HashMap<>();
         mProvider.mSlicesDatabaseAccessor = new SlicesDatabaseAccessor(mContext);
-        mProvider.mCustomSliceManager = new CustomSliceManager(mContext);
         when(mProvider.getContext()).thenReturn(mContext);
 
         SlicesDatabaseHelper.getInstance(mContext).setIndexedState();

tests/robotests/src/com/android/settings/slices/SlicesDatabaseHelperTest.java

@@ -55,6 +55,7 @@ public class SlicesDatabaseHelperTest {
     @After
     public void cleanUp() {
         DatabaseTestUtils.clearDb(mContext);
+        mDatabase.close();
     }
 
     @Test