commit a66dfee8d0946b301dda9853e1782b7fef7600ff
author Jason Monk <jmonk@google.com> Fri May 11 08:23:59 2018 -0700
committer Jason Monk <jmonk@google.com> Fri May 11 08:23:59 2018 -0700
tree 46e784039951a93a68773969f97a76074dd439d9
parent 3b592910c50856a3b28a07a735c31e19f44bc460

Allow onGetSliceDescendants to be slow

Because sometimes it needs to be

Test: existing tests
Bug: 79132845
Bug: 77873463
Change-Id: I93aa8553c48c856bf96c347a229be6e770751708

core/java/android/app/slice/SliceManager.java

diff --git a/core/java/android/app/slice/SliceManager.java b/core/java/android/app/slice/SliceManager.java
index 22df6c0..f682ec1 100644
--- a/core/java/android/app/slice/SliceManager.java
+++ b/core/java/android/app/slice/SliceManager.java
@@ -23,6 +23,7 @@
 import android.annotation.SdkConstant;
 import android.annotation.SdkConstant.SdkConstantType;
 import android.annotation.SystemService;
+import android.annotation.WorkerThread;
 import android.content.ContentProviderClient;
 import android.content.ContentResolver;
 import android.content.Context;
@@ -217,6 +218,7 @@
      * @return All slices within the space.
      * @see SliceProvider#onGetSliceDescendants(Uri)
      */
+    @WorkerThread
     public @NonNull Collection<Uri> getSliceDescendants(@NonNull Uri uri) {
         ContentResolver resolver = mContext.getContentResolver();
         try (ContentProviderClient provider = resolver.acquireContentProviderClient(uri)) {