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 
am: d68ed5c92c

Change-Id: Ice176c79605250c263a21cbc624b438902dfaedc
This commit is contained in:
Jason Monk
2018-05-24 19:04:31 -07:00
committed by android-build-merger
parent 6c1c1a6a50 d68ed5c92c
commit 667d662d85
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.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() {