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

Relax null checks to fix tests.

Browse Source 
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:
Jeff Sharkey
2021-03-08 14:17:34 +00:00
committed by Jeff Sharkey
parent b95b1a2eff
commit 479d90cefd
1 changed files with 7 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
core/java/android/content/ContextParams.java
View File

@@ -127,7 +127,7 @@ public final class ContextParams {
*/ */
@NonNull @NonNull
public Builder setAttributionTag(@NonNull String attributionTag) { public Builder setAttributionTag(@NonNull String attributionTag) {
mAttributionTag = Objects.requireNonNull(attributionTag); mAttributionTag = attributionTag;
return this; return this;
} }
@@ -142,7 +142,7 @@ public final class ContextParams {
@NonNull @NonNull
public Builder setReceiverPackage(@NonNull String packageName, public Builder setReceiverPackage(@NonNull String packageName,
@Nullable String attributionTag) { @Nullable String attributionTag) {
mReceiverPackage = Objects.requireNonNull(packageName); mReceiverPackage = packageName;
mReceiverAttributionTag = attributionTag; mReceiverAttributionTag = attributionTag;
return this; return this;
} }
@@ -170,7 +170,11 @@ public final class ContextParams {
@SystemApi @SystemApi
@RequiresPermission(android.Manifest.permission.RENOUNCE_PERMISSIONS) @RequiresPermission(android.Manifest.permission.RENOUNCE_PERMISSIONS)
public @NonNull Builder setRenouncedPermissions(@NonNull Set<String> renouncedPermissions) { public @NonNull Builder setRenouncedPermissions(@NonNull Set<String> renouncedPermissions) {
if (renouncedPermissions != null) {
mRenouncedPermissions = Collections.unmodifiableSet(renouncedPermissions); mRenouncedPermissions = Collections.unmodifiableSet(renouncedPermissions);
} else {
mRenouncedPermissions = null;
}
return this; return this;
} }