Relax null checks to fix tests.
The nullability annotations on these methods are aspirational, and a recent CL started routing many existing call-sites through them, so we'll need to start allowing nulls. I'm not at a full workstation right now, so this CL simply relaxes the enforcement, and a future CL will adjust the API annotations. Bug: 182091763 Change-Id: I43d49747deb8c7881d942eba48237eb0fccc7acd Merged-In: I43d49747deb8c7881d942eba48237eb0fccc7acd
This commit is contained in:
committed by
Jeff Sharkey
parent
b95b1a2eff
commit
479d90cefd
@@ -127,7 +127,7 @@ public final class ContextParams {
|
||||
*/
|
||||
@NonNull
|
||||
public Builder setAttributionTag(@NonNull String attributionTag) {
|
||||
mAttributionTag = Objects.requireNonNull(attributionTag);
|
||||
mAttributionTag = attributionTag;
|
||||
return this;
|
||||
}
|
||||
|
||||
@@ -142,7 +142,7 @@ public final class ContextParams {
|
||||
@NonNull
|
||||
public Builder setReceiverPackage(@NonNull String packageName,
|
||||
@Nullable String attributionTag) {
|
||||
mReceiverPackage = Objects.requireNonNull(packageName);
|
||||
mReceiverPackage = packageName;
|
||||
mReceiverAttributionTag = attributionTag;
|
||||
return this;
|
||||
}
|
||||
@@ -170,7 +170,11 @@ public final class ContextParams {
|
||||
@SystemApi
|
||||
@RequiresPermission(android.Manifest.permission.RENOUNCE_PERMISSIONS)
|
||||
public @NonNull Builder setRenouncedPermissions(@NonNull Set<String> renouncedPermissions) {
|
||||
mRenouncedPermissions = Collections.unmodifiableSet(renouncedPermissions);
|
||||
if (renouncedPermissions != null) {
|
||||
mRenouncedPermissions = Collections.unmodifiableSet(renouncedPermissions);
|
||||
} else {
|
||||
mRenouncedPermissions = null;
|
||||
}
|
||||
return this;
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user