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

Merge changes from topic "mar8" into sc-dev

Browse Source 
* changes:
  Refinement of ContextParams behavior.
  Relax null checks to fix tests.
This commit is contained in:
Jeff Sharkey
2021-03-09 22:35:49 +00:00
committed by Android (Google) Code Review
parent b41c7af72c 29e882b417
commit c8faccf35a
4 changed files with 48 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -119,6 +119,37 @@ public final class ContextParams {
private String mReceiverAttributionTag;
private Set<String> mRenouncedPermissions;
/**
* Create a new builder.
* <p>
* This is valuable when you are interested in having explicit control
* over every sub-parameter, and don't want to inherit any values from
* an existing Context.
* <p>
* Developers should strongly consider using
* {@link #Builder(ContextParams)} instead of this constructor, since
* that will will automatically inherit any new sub-parameters added in
* future platform releases.
*/
public Builder() {
}
/**
* Create a new builder that inherits all sub-parameters by default.
* <p>
* This is valuable when you are only interested in overriding specific
* sub-parameters, and want to preserve all other parameters. Setting a
* specific sub-parameter on the returned builder will override any
* inherited value.
*/
public Builder(@NonNull ContextParams params) {
Objects.requireNonNull(params);
mAttributionTag = params.mAttributionTag;
mReceiverPackage = params.mReceiverPackage;
mReceiverAttributionTag = params.mReceiverAttributionTag;
mRenouncedPermissions = params.mRenouncedPermissions;
}
/**
* Sets an attribution tag against which to track permission accesses.
*
@@ -126,8 +157,8 @@ public final class ContextParams {
* @return This builder.
*/
@NonNull
public Builder setAttributionTag(@NonNull String attributionTag) {
mAttributionTag = Objects.requireNonNull(attributionTag);
public Builder setAttributionTag(@Nullable String attributionTag) {
mAttributionTag = attributionTag;
return this;
}
@@ -140,9 +171,9 @@ public final class ContextParams {
* @return This builder.
*/
@NonNull
public Builder setReceiverPackage(@NonNull String packageName,
public Builder setReceiverPackage(@Nullable String packageName,
@Nullable String attributionTag) {
mReceiverPackage = Objects.requireNonNull(packageName);
mReceiverPackage = packageName;
mReceiverAttributionTag = attributionTag;
return this;
}
@@ -169,8 +200,13 @@ public final class ContextParams {
*/
@SystemApi
@RequiresPermission(android.Manifest.permission.RENOUNCE_PERMISSIONS)
public @NonNull Builder setRenouncedPermissions(@NonNull Set<String> renouncedPermissions) {
mRenouncedPermissions = Collections.unmodifiableSet(renouncedPermissions);
public @NonNull Builder setRenouncedPermissions(
@Nullable Set<String> renouncedPermissions) {
if (renouncedPermissions != null) {
mRenouncedPermissions = Collections.unmodifiableSet(renouncedPermissions);
} else {
mRenouncedPermissions = null;
}
return this;
}