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

Merge "SliceManager: Relax explicit checks on map a little bit" into pi-dev

Browse Source 
am: 0b795eb88e

Change-Id: I7b480717453d7ace26033066279a3c20e68cb7aa
This commit is contained in:
Jason Monk
2018-03-16 02:07:06 +00:00
committed by android-build-merger
parent 3c0f033160 0b795eb88e
commit 6bea8a4bb9
1 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -273,7 +273,8 @@ public class SliceManager {
*/ */
public @Nullable Uri mapIntentToUri(@NonNull Intent intent) { public @Nullable Uri mapIntentToUri(@NonNull Intent intent) {
Preconditions.checkNotNull(intent, "intent"); Preconditions.checkNotNull(intent, "intent");
Preconditions.checkArgument(intent.getComponent() != null || intent.getPackage() != null, Preconditions.checkArgument(intent.getComponent() != null || intent.getPackage() != null
|| intent.getData() != null,
"Slice intent must be explicit %s", intent); "Slice intent must be explicit %s", intent);
ContentResolver resolver = mContext.getContentResolver(); ContentResolver resolver = mContext.getContentResolver();
@@ -337,7 +338,8 @@ public class SliceManager {
public @Nullable Slice bindSlice(@NonNull Intent intent, public @Nullable Slice bindSlice(@NonNull Intent intent,
@NonNull List<SliceSpec> supportedSpecs) { @NonNull List<SliceSpec> supportedSpecs) {
Preconditions.checkNotNull(intent, "intent"); Preconditions.checkNotNull(intent, "intent");
Preconditions.checkArgument(intent.getComponent() != null || intent.getPackage() != null, Preconditions.checkArgument(intent.getComponent() != null || intent.getPackage() != null
|| intent.getData() != null,
"Slice intent must be explicit %s", intent); "Slice intent must be explicit %s", intent);
ContentResolver resolver = mContext.getContentResolver(); ContentResolver resolver = mContext.getContentResolver();