summaryrefslogtreecommitdiff
path: root/core/java/android/content/ContentProvider.java
diff options
context:
space:
mode:
authorMady Mellor <madym@google.com>2017-09-29 09:49:59 -0700
committerMady Mellor <madym@google.com>2017-10-07 11:41:26 -0700
commit4575aa52d7736ab51a4f72f5852b98d357783839 (patch)
treec2f3ee7e5384c66c401483c697028b21f3e4a1b5 /core/java/android/content/ContentProvider.java
parent67e48e878c226e10d911faecc79851cdaa01a400 (diff)
First version of SliceView (hidden for now)
Very basic template support Test: to be added Change-Id: Ie5720345e23909dd12d0b0c2facfee687da2ae1a
Diffstat (limited to 'core/java/android/content/ContentProvider.java')
-rw-r--r--core/java/android/content/ContentProvider.java3
1 files changed, 2 insertions, 1 deletions
diff --git a/core/java/android/content/ContentProvider.java b/core/java/android/content/ContentProvider.java
index cdeaea3ebcae..5b2bf456b4e8 100644
--- a/core/java/android/content/ContentProvider.java
+++ b/core/java/android/content/ContentProvider.java
@@ -2099,7 +2099,8 @@ public abstract class ContentProvider implements ComponentCallbacks2 {
public static Uri maybeAddUserId(Uri uri, int userId) {
if (uri == null) return null;
if (userId != UserHandle.USER_CURRENT
- && ContentResolver.SCHEME_CONTENT.equals(uri.getScheme())) {
+ && (ContentResolver.SCHEME_CONTENT.equals(uri.getScheme())
+ || ContentResolver.SCHEME_SLICE.equals(uri.getScheme()))) {
if (!uriHasUserId(uri)) {
//We don't add the user Id if there's already one
Uri.Builder builder = uri.buildUpon();