PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Reduce scope for some methods in SliceFeatureProvider

Browse Source 
Bug: 123937830
Test: rebuild
Change-Id: I62db60e8313fc94324b476642fe27a215b76b33d
This commit is contained in:
Fan Zhang
2019-03-13 15:19:51 -07:00
parent 6a312ab57a
commit 6120d57cbc
4 changed files with 7 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/com/android/settings/slices/SlicesFeatureProvider.java
View File

@@ -12,8 +12,6 @@ public interface SlicesFeatureProvider {
boolean DEBUG = false; boolean DEBUG = false;
SlicesIndexer getSliceIndexer(Context context);
SliceDataConverter getSliceDataConverter(Context context); SliceDataConverter getSliceDataConverter(Context context);
/** /**

15
src/com/android/settings/slices/SlicesFeatureProviderImpl.java
View File

@@ -31,14 +31,6 @@ public class SlicesFeatureProviderImpl implements SlicesFeatureProvider {
private SliceDataConverter mSliceDataConverter; private SliceDataConverter mSliceDataConverter;
private CustomSliceManager mCustomSliceManager; private CustomSliceManager mCustomSliceManager;
@Override
public SlicesIndexer getSliceIndexer(Context context) {
if (mSlicesIndexer == null) {
mSlicesIndexer = new SlicesIndexer(context.getApplicationContext());
}
return mSlicesIndexer;
}
@Override @Override
public SliceDataConverter getSliceDataConverter(Context context) { public SliceDataConverter getSliceDataConverter(Context context) {
if (mSliceDataConverter == null) { if (mSliceDataConverter == null) {
@@ -76,4 +68,11 @@ public class SlicesFeatureProviderImpl implements SlicesFeatureProvider {
public Enhanced4gLteSliceHelper getNewEnhanced4gLteSliceHelper(Context context) { public Enhanced4gLteSliceHelper getNewEnhanced4gLteSliceHelper(Context context) {
return new Enhanced4gLteSliceHelper(context); return new Enhanced4gLteSliceHelper(context);
} }
private SlicesIndexer getSliceIndexer(Context context) {
if (mSlicesIndexer == null) {
mSlicesIndexer = new SlicesIndexer(context.getApplicationContext());
}
return mSlicesIndexer;
}
} }

6
tests/robotests/src/com/android/settings/network/telephony/Enhanced4gLteSliceHelperTest.java
View File

@@ -22,7 +22,6 @@ import static android.app.slice.SliceItem.FORMAT_TEXT;
import static com.google.common.truth.Truth.assertThat; import static com.google.common.truth.Truth.assertThat;
import static org.mockito.ArgumentMatchers.any;
import static org.mockito.Mockito.doReturn; import static org.mockito.Mockito.doReturn;
import static org.mockito.Mockito.spy; import static org.mockito.Mockito.spy;
import static org.mockito.Mockito.verify; import static org.mockito.Mockito.verify;
@@ -43,7 +42,6 @@ import androidx.slice.widget.SliceLiveData;
import com.android.ims.ImsManager; import com.android.ims.ImsManager;
import com.android.settings.R; import com.android.settings.R;
import com.android.settings.slices.CustomSliceManager;
import com.android.settings.slices.CustomSliceRegistry; import com.android.settings.slices.CustomSliceRegistry;
import com.android.settings.slices.SettingsSliceProvider; import com.android.settings.slices.SettingsSliceProvider;
import com.android.settings.slices.SliceBroadcastReceiver; import com.android.settings.slices.SliceBroadcastReceiver;
@@ -85,10 +83,6 @@ public class Enhanced4gLteSliceHelperTest {
mFeatureFactory = FakeFeatureFactory.setupForTest(); mFeatureFactory = FakeFeatureFactory.setupForTest();
mSlicesFeatureProvider = mFeatureFactory.getSlicesFeatureProvider(); mSlicesFeatureProvider = mFeatureFactory.getSlicesFeatureProvider();
CustomSliceManager manager = new CustomSliceManager(mContext);
when(mSlicesFeatureProvider.getCustomSliceManager(any(Context.class)))
.thenReturn(manager);
//setup for SettingsSliceProvider tests //setup for SettingsSliceProvider tests
mProvider = spy(new SettingsSliceProvider()); mProvider = spy(new SettingsSliceProvider());
doReturn(mContext).when(mProvider).getContext(); doReturn(mContext).when(mProvider).getContext();

5
tests/robotests/src/com/android/settings/wifi/calling/WifiCallingSliceHelperTest.java
View File

@@ -22,7 +22,6 @@ import static android.app.slice.SliceItem.FORMAT_TEXT;
import static com.google.common.truth.Truth.assertThat; import static com.google.common.truth.Truth.assertThat;
import static org.mockito.ArgumentMatchers.any;
import static org.mockito.ArgumentMatchers.eq; import static org.mockito.ArgumentMatchers.eq;
import static org.mockito.Mockito.doReturn; import static org.mockito.Mockito.doReturn;
import static org.mockito.Mockito.spy; import static org.mockito.Mockito.spy;
@@ -48,7 +47,6 @@ import androidx.slice.widget.SliceLiveData;
import com.android.ims.ImsConfig; import com.android.ims.ImsConfig;
import com.android.ims.ImsManager; import com.android.ims.ImsManager;
import com.android.settings.R; import com.android.settings.R;
import com.android.settings.slices.CustomSliceManager;
import com.android.settings.slices.CustomSliceRegistry; import com.android.settings.slices.CustomSliceRegistry;
import com.android.settings.slices.SettingsSliceProvider; import com.android.settings.slices.SettingsSliceProvider;
import com.android.settings.slices.SliceBroadcastReceiver; import com.android.settings.slices.SliceBroadcastReceiver;
@@ -99,9 +97,6 @@ public class WifiCallingSliceHelperTest {
mFeatureFactory = FakeFeatureFactory.setupForTest(); mFeatureFactory = FakeFeatureFactory.setupForTest();
mSlicesFeatureProvider = mFeatureFactory.getSlicesFeatureProvider(); mSlicesFeatureProvider = mFeatureFactory.getSlicesFeatureProvider();
CustomSliceManager manager = new CustomSliceManager(mContext);
when(mSlicesFeatureProvider.getCustomSliceManager(any(Context.class)))
.thenReturn(manager);
mWfcSliceHelper = new FakeWifiCallingSliceHelper(mContext); mWfcSliceHelper = new FakeWifiCallingSliceHelper(mContext);