Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 0e08cfa0 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Reduce scope for some methods in SliceFeatureProvider"

parents 0dbefb00 6120d57c

src/com/android/settings/slices/SlicesFeatureProvider.java

+0 −2
Original line number Diff line number Diff line
@@ -12,8 +12,6 @@ public interface SlicesFeatureProvider { 


    boolean DEBUG = false;



    SlicesIndexer getSliceIndexer(Context context);



    SliceDataConverter getSliceDataConverter(Context context);



    /**

src/com/android/settings/slices/SlicesFeatureProviderImpl.java

+7 −8
Original line number Diff line number Diff line
@@ -31,14 +31,6 @@ public class SlicesFeatureProviderImpl implements SlicesFeatureProvider { 
    private SliceDataConverter mSliceDataConverter;

    private CustomSliceManager mCustomSliceManager;



    @Override

    public SlicesIndexer getSliceIndexer(Context context) {

        if (mSlicesIndexer == null) {

            mSlicesIndexer = new SlicesIndexer(context.getApplicationContext());

        }

        return mSlicesIndexer;

    }



    @Override

    public SliceDataConverter getSliceDataConverter(Context context) {

        if (mSliceDataConverter == null) {
@@ -76,4 +68,11 @@ public class SlicesFeatureProviderImpl implements SlicesFeatureProvider { 
    public Enhanced4gLteSliceHelper getNewEnhanced4gLteSliceHelper(Context context) {

        return new Enhanced4gLteSliceHelper(context);

    }



    private SlicesIndexer getSliceIndexer(Context context) {

        if (mSlicesIndexer == null) {

            mSlicesIndexer = new SlicesIndexer(context.getApplicationContext());

        }

        return mSlicesIndexer;

    }

}

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

+0 −6
Original line number Diff line number Diff line
@@ -22,7 +22,6 @@ import static android.app.slice.SliceItem.FORMAT_TEXT; 


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.spy;

import static org.mockito.Mockito.verify;
@@ -43,7 +42,6 @@ import androidx.slice.widget.SliceLiveData; 


import com.android.ims.ImsManager;

import com.android.settings.R;

import com.android.settings.slices.CustomSliceManager;

import com.android.settings.slices.CustomSliceRegistry;

import com.android.settings.slices.SettingsSliceProvider;

import com.android.settings.slices.SliceBroadcastReceiver;
@@ -85,10 +83,6 @@ public class Enhanced4gLteSliceHelperTest { 
        mFeatureFactory = FakeFeatureFactory.setupForTest();

        mSlicesFeatureProvider = mFeatureFactory.getSlicesFeatureProvider();



        CustomSliceManager manager = new CustomSliceManager(mContext);

        when(mSlicesFeatureProvider.getCustomSliceManager(any(Context.class)))

                .thenReturn(manager);



        //setup for SettingsSliceProvider tests

        mProvider = spy(new SettingsSliceProvider());

        doReturn(mContext).when(mProvider).getContext();

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

+0 −5
Original line number Diff line number Diff line
@@ -22,7 +22,6 @@ import static android.app.slice.SliceItem.FORMAT_TEXT; 


import static com.google.common.truth.Truth.assertThat;



import static org.mockito.ArgumentMatchers.any;

import static org.mockito.ArgumentMatchers.eq;

import static org.mockito.Mockito.doReturn;

import static org.mockito.Mockito.spy;
@@ -48,7 +47,6 @@ import androidx.slice.widget.SliceLiveData; 
import com.android.ims.ImsConfig;

import com.android.ims.ImsManager;

import com.android.settings.R;

import com.android.settings.slices.CustomSliceManager;

import com.android.settings.slices.CustomSliceRegistry;

import com.android.settings.slices.SettingsSliceProvider;

import com.android.settings.slices.SliceBroadcastReceiver;
@@ -99,9 +97,6 @@ public class WifiCallingSliceHelperTest { 


        mFeatureFactory = FakeFeatureFactory.setupForTest();

        mSlicesFeatureProvider = mFeatureFactory.getSlicesFeatureProvider();

        CustomSliceManager manager = new CustomSliceManager(mContext);

        when(mSlicesFeatureProvider.getCustomSliceManager(any(Context.class)))

                .thenReturn(manager);



        mWfcSliceHelper = new FakeWifiCallingSliceHelper(mContext);