Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Allow onGetSliceDescendants to be slow" into pi-dev

Browse Source 
am: 02b9592ff1

Change-Id: I91899f01fd769c313e62000eee277ab3242099f0
This commit is contained in:
Jason Monk
2018-05-11 10:37:59 -07:00
committed by android-build-merger
parent 8bbf6a4eab 02b9592ff1
commit 16db9b96bf
2 changed files with 3 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
core/java/android/app/slice/SliceManager.java
View File

@@ -23,6 +23,7 @@ import android.annotation.Nullable;
import android.annotation.SdkConstant; import android.annotation.SdkConstant;
import android.annotation.SdkConstant.SdkConstantType; import android.annotation.SdkConstant.SdkConstantType;
import android.annotation.SystemService; import android.annotation.SystemService;
import android.annotation.WorkerThread;
import android.content.ContentProviderClient; import android.content.ContentProviderClient;
import android.content.ContentResolver; import android.content.ContentResolver;
import android.content.Context; import android.content.Context;
@@ -217,6 +218,7 @@ public class SliceManager {
* @return All slices within the space. * @return All slices within the space.
* @see SliceProvider#onGetSliceDescendants(Uri) * @see SliceProvider#onGetSliceDescendants(Uri)
*/ */
@WorkerThread
public @NonNull Collection<Uri> getSliceDescendants(@NonNull Uri uri) { public @NonNull Collection<Uri> getSliceDescendants(@NonNull Uri uri) {
ContentResolver resolver = mContext.getContentResolver(); ContentResolver resolver = mContext.getContentResolver();
try (ContentProviderClient provider = resolver.acquireContentProviderClient(uri)) { try (ContentProviderClient provider = resolver.acquireContentProviderClient(uri)) {

7
core/java/android/app/slice/SliceProvider.java
View File

@@ -398,12 +398,7 @@ public abstract class SliceProvider extends ContentProvider {
private Collection<Uri> handleGetDescendants(Uri uri) { private Collection<Uri> handleGetDescendants(Uri uri) {
mCallback = "onGetSliceDescendants"; mCallback = "onGetSliceDescendants";
Handler.getMain().postDelayed(mAnr, SLICE_BIND_ANR); return onGetSliceDescendants(uri);
try {
return onGetSliceDescendants(uri);
} finally {
Handler.getMain().removeCallbacks(mAnr);
}
} }
private void handlePinSlice(Uri sliceUri) { private void handlePinSlice(Uri sliceUri) {