diff options
| -rw-r--r-- | core/java/android/app/slice/SliceProvider.java | 8 | ||||
| -rw-r--r-- | services/core/java/com/android/server/slice/SliceManagerService.java | 4 |
2 files changed, 6 insertions, 6 deletions
diff --git a/core/java/android/app/slice/SliceProvider.java b/core/java/android/app/slice/SliceProvider.java index 8ffacf5280c1..c4316a0ba086 100644 --- a/core/java/android/app/slice/SliceProvider.java +++ b/core/java/android/app/slice/SliceProvider.java @@ -299,7 +299,7 @@ public abstract class SliceProvider extends ContentProvider { @Override public Bundle call(String method, String arg, Bundle extras) { if (method.equals(METHOD_SLICE)) { - Uri uri = extras.getParcelable(EXTRA_BIND_URI); + Uri uri = getUriWithoutUserId(extras.getParcelable(EXTRA_BIND_URI)); List<SliceSpec> supportedSpecs = extras.getParcelableArrayList(EXTRA_SUPPORTED_SPECS); String callingPackage = getCallingPackage(); @@ -327,19 +327,19 @@ public abstract class SliceProvider extends ContentProvider { } return b; } else if (method.equals(METHOD_PIN)) { - Uri uri = extras.getParcelable(EXTRA_BIND_URI); + Uri uri = getUriWithoutUserId(extras.getParcelable(EXTRA_BIND_URI)); if (Binder.getCallingUid() != Process.SYSTEM_UID) { throw new SecurityException("Only the system can pin/unpin slices"); } handlePinSlice(uri); } else if (method.equals(METHOD_UNPIN)) { - Uri uri = extras.getParcelable(EXTRA_BIND_URI); + Uri uri = getUriWithoutUserId(extras.getParcelable(EXTRA_BIND_URI)); if (Binder.getCallingUid() != Process.SYSTEM_UID) { throw new SecurityException("Only the system can pin/unpin slices"); } handleUnpinSlice(uri); } else if (method.equals(METHOD_GET_DESCENDANTS)) { - Uri uri = extras.getParcelable(EXTRA_BIND_URI); + Uri uri = getUriWithoutUserId(extras.getParcelable(EXTRA_BIND_URI)); Bundle b = new Bundle(); b.putParcelableArrayList(EXTRA_SLICE_DESCENDANTS, new ArrayList<>(handleGetDescendants(uri))); diff --git a/services/core/java/com/android/server/slice/SliceManagerService.java b/services/core/java/com/android/server/slice/SliceManagerService.java index ca7632c354d1..c62a8560be20 100644 --- a/services/core/java/com/android/server/slice/SliceManagerService.java +++ b/services/core/java/com/android/server/slice/SliceManagerService.java @@ -233,7 +233,7 @@ public class SliceManagerService extends ISliceManager.Stub { } @VisibleForTesting - PinnedSliceState createPinnedSlice(Uri uri) { + protected PinnedSliceState createPinnedSlice(Uri uri) { return new PinnedSliceState(this, uri); } @@ -352,7 +352,7 @@ public class SliceManagerService extends ISliceManager.Stub { // Based on getDefaultHome in ShortcutService. // TODO: Unify if possible @VisibleForTesting - String getDefaultHome(int userId) { + protected String getDefaultHome(int userId) { final long token = Binder.clearCallingIdentity(); try { final List<ResolveInfo> allHomeCandidates = new ArrayList<>(); |