diff --git a/src/com/android/settings/search/DeviceIndexUpdateJobService.java b/src/com/android/settings/search/DeviceIndexUpdateJobService.java index 97b0a61ca6b..3eb904119bc 100644 --- a/src/com/android/settings/search/DeviceIndexUpdateJobService.java +++ b/src/com/android/settings/search/DeviceIndexUpdateJobService.java @@ -38,8 +38,8 @@ import java.util.concurrent.CountDownLatch; import androidx.slice.Slice; import androidx.slice.SliceItem; -import androidx.slice.SliceManager; -import androidx.slice.SliceManager.SliceCallback; +import androidx.slice.SliceViewManager; +import androidx.slice.SliceViewManager.SliceCallback; import androidx.slice.SliceMetadata; import androidx.slice.core.SliceQuery; import androidx.slice.widget.ListContent; @@ -80,7 +80,7 @@ public class DeviceIndexUpdateJobService extends JobService { } final DeviceIndexFeatureProvider indexProvider = FeatureFactory.getFactory(this) .getDeviceIndexFeatureProvider(); - final SliceManager manager = getSliceManager(); + final SliceViewManager manager = getSliceViewManager(); final Uri baseUri = new Builder() .scheme(ContentResolver.SCHEME_CONTENT) .authority(SettingsSliceProvider.SLICE_AUTHORITY) @@ -124,8 +124,8 @@ public class DeviceIndexUpdateJobService extends JobService { jobFinished(params, false); } - protected SliceManager getSliceManager() { - return SliceManager.getInstance(this); + protected SliceViewManager getSliceViewManager() { + return SliceViewManager.getInstance(this); } protected SliceMetadata getMetadata(Slice loadedSlice) { @@ -158,7 +158,7 @@ public class DeviceIndexUpdateJobService extends JobService { return null; } - protected Slice bindSliceSynchronous(SliceManager manager, Uri slice) { + protected Slice bindSliceSynchronous(SliceViewManager manager, Uri slice) { final Slice[] returnSlice = new Slice[1]; CountDownLatch latch = new CountDownLatch(1); SliceCallback callback = new SliceCallback() { diff --git a/tests/robotests/src/com/android/settings/search/DeviceIndexUpdateJobServiceTest.java b/tests/robotests/src/com/android/settings/search/DeviceIndexUpdateJobServiceTest.java index b5de9737db2..1c02b99323d 100644 --- a/tests/robotests/src/com/android/settings/search/DeviceIndexUpdateJobServiceTest.java +++ b/tests/robotests/src/com/android/settings/search/DeviceIndexUpdateJobServiceTest.java @@ -45,7 +45,7 @@ import java.util.ArrayList; import java.util.List; import androidx.slice.Slice; -import androidx.slice.SliceManager; +import androidx.slice.SliceViewManager; import androidx.slice.SliceMetadata; @RunWith(SettingsRobolectricTestRunner.class) @@ -57,17 +57,17 @@ public class DeviceIndexUpdateJobServiceTest { private Activity mActivity; private DeviceIndexUpdateJobService mJob; - private SliceManager mSliceManager; + private SliceViewManager mSliceManager; @Before public void setup() { FakeFeatureFactory.setupForTest(); mActivity = spy(Robolectric.buildActivity(Activity.class).create().visible().get()); mJob = spy(new DeviceIndexUpdateJobService()); - mSliceManager = mock(SliceManager.class); + mSliceManager = mock(SliceViewManager.class); doReturn(mActivity.getPackageName()).when(mJob).getPackageName(); - doReturn(mSliceManager).when(mJob).getSliceManager(); + doReturn(mSliceManager).when(mJob).getSliceViewManager(); doNothing().when(mJob).jobFinished(null, false); } @@ -144,4 +144,4 @@ public class DeviceIndexUpdateJobServiceTest { when(mSliceManager.getSliceDescendants(BASE_URI)).thenReturn(mUris); } -} \ No newline at end of file +}