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

Merge "Follow SliceManager API changes" into pi-dev

Browse Source
This commit is contained in:
Jason Monk
2018-05-25 01:21:35 +00:00
committed by Android (Google) Code Review
parent 2357c1cd84 20495a8c36
commit d68ed5c92c
2 changed files with 11 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/com/android/settings/search/DeviceIndexUpdateJobService.java
View File

@@ -38,8 +38,8 @@ import java.util.concurrent.CountDownLatch;
import androidx.slice.Slice; import androidx.slice.Slice;
import androidx.slice.SliceItem; import androidx.slice.SliceItem;
import androidx.slice.SliceManager; import androidx.slice.SliceViewManager;
import androidx.slice.SliceManager.SliceCallback; import androidx.slice.SliceViewManager.SliceCallback;
import androidx.slice.SliceMetadata; import androidx.slice.SliceMetadata;
import androidx.slice.core.SliceQuery; import androidx.slice.core.SliceQuery;
import androidx.slice.widget.ListContent; import androidx.slice.widget.ListContent;
@@ -80,7 +80,7 @@ public class DeviceIndexUpdateJobService extends JobService {
} }
final DeviceIndexFeatureProvider indexProvider = FeatureFactory.getFactory(this) final DeviceIndexFeatureProvider indexProvider = FeatureFactory.getFactory(this)
.getDeviceIndexFeatureProvider(); .getDeviceIndexFeatureProvider();
final SliceManager manager = getSliceManager(); final SliceViewManager manager = getSliceViewManager();
final Uri baseUri = new Builder() final Uri baseUri = new Builder()
.scheme(ContentResolver.SCHEME_CONTENT) .scheme(ContentResolver.SCHEME_CONTENT)
.authority(SettingsSliceProvider.SLICE_AUTHORITY) .authority(SettingsSliceProvider.SLICE_AUTHORITY)
@@ -124,8 +124,8 @@ public class DeviceIndexUpdateJobService extends JobService {
jobFinished(params, false); jobFinished(params, false);
} }
protected SliceManager getSliceManager() { protected SliceViewManager getSliceViewManager() {
return SliceManager.getInstance(this); return SliceViewManager.getInstance(this);
} }
protected SliceMetadata getMetadata(Slice loadedSlice) { protected SliceMetadata getMetadata(Slice loadedSlice) {
@@ -158,7 +158,7 @@ public class DeviceIndexUpdateJobService extends JobService {
return null; return null;
} }
protected Slice bindSliceSynchronous(SliceManager manager, Uri slice) { protected Slice bindSliceSynchronous(SliceViewManager manager, Uri slice) {
final Slice[] returnSlice = new Slice[1]; final Slice[] returnSlice = new Slice[1];
CountDownLatch latch = new CountDownLatch(1); CountDownLatch latch = new CountDownLatch(1);
SliceCallback callback = new SliceCallback() { SliceCallback callback = new SliceCallback() {

10
tests/robotests/src/com/android/settings/search/DeviceIndexUpdateJobServiceTest.java
View File

@@ -45,7 +45,7 @@ import java.util.ArrayList;
import java.util.List; import java.util.List;
import androidx.slice.Slice; import androidx.slice.Slice;
import androidx.slice.SliceManager; import androidx.slice.SliceViewManager;
import androidx.slice.SliceMetadata; import androidx.slice.SliceMetadata;
@RunWith(SettingsRobolectricTestRunner.class) @RunWith(SettingsRobolectricTestRunner.class)
@@ -57,17 +57,17 @@ public class DeviceIndexUpdateJobServiceTest {
private Activity mActivity; private Activity mActivity;
private DeviceIndexUpdateJobService mJob; private DeviceIndexUpdateJobService mJob;
private SliceManager mSliceManager; private SliceViewManager mSliceManager;
@Before @Before
public void setup() { public void setup() {
FakeFeatureFactory.setupForTest(); FakeFeatureFactory.setupForTest();
mActivity = spy(Robolectric.buildActivity(Activity.class).create().visible().get()); mActivity = spy(Robolectric.buildActivity(Activity.class).create().visible().get());
mJob = spy(new DeviceIndexUpdateJobService()); mJob = spy(new DeviceIndexUpdateJobService());
mSliceManager = mock(SliceManager.class); mSliceManager = mock(SliceViewManager.class);
doReturn(mActivity.getPackageName()).when(mJob).getPackageName(); doReturn(mActivity.getPackageName()).when(mJob).getPackageName();
doReturn(mSliceManager).when(mJob).getSliceManager(); doReturn(mSliceManager).when(mJob).getSliceViewManager();
doNothing().when(mJob).jobFinished(null, false); doNothing().when(mJob).jobFinished(null, false);
} }
@@ -144,4 +144,4 @@ public class DeviceIndexUpdateJobServiceTest {
when(mSliceManager.getSliceDescendants(BASE_URI)).thenReturn(mUris); when(mSliceManager.getSliceDescendants(BASE_URI)).thenReturn(mUris);
} }
} }