summaryrefslogtreecommitdiff
path: root/core/java/android
diff options
context:
space:
mode:
authorJason Monk <jmonk@google.com>2018-04-12 19:47:50 -0400
committerJason Monk <jmonk@google.com>2018-04-12 20:05:27 -0400
commit199286b084988976b3e5dd186210552b96e33d08 (patch)
tree8f7d349faf883ddf7c19ebacc4df0e90c618bca4 /core/java/android
parenta87e56c97ad578e2014c81a02d7d744b5850686f (diff)
Fix pinned slices returning different Uris.
Test: cts Bug: 77980070 Change-Id: I3c5ba18e40a58371e2c9ccade9d565b38ad12a54
Diffstat (limited to 'core/java/android')
-rw-r--r--core/java/android/app/slice/SliceProvider.java3
1 files changed, 2 insertions, 1 deletions
diff --git a/core/java/android/app/slice/SliceProvider.java b/core/java/android/app/slice/SliceProvider.java
index 7d8e394dbc35..9e4e97a011fa 100644
--- a/core/java/android/app/slice/SliceProvider.java
+++ b/core/java/android/app/slice/SliceProvider.java
@@ -37,6 +37,7 @@ import android.os.Handler;
import android.os.Process;
import android.os.StrictMode;
import android.os.StrictMode.ThreadPolicy;
+import android.util.ArraySet;
import android.util.Log;
import java.util.ArrayList;
@@ -513,7 +514,7 @@ public abstract class SliceProvider extends ContentProvider {
.detectAll()
.penaltyDeath()
.build());
- return onBindSlice(sliceUri, supportedSpecs);
+ return onBindSlice(sliceUri, new ArraySet<>(supportedSpecs));
} finally {
StrictMode.setThreadPolicy(oldPolicy);
}