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 am: c8faccf35a

Browse Source 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13809611

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Icf1f0c84ba1baab8e8bd9c08c2c12d38a679518c
This commit is contained in:
Jeff Sharkey
2021-03-09 23:09:10 +00:00
committed by Automerger Merge Worker
parent 6df6e7ef2f c8faccf35a
commit 27471aeea8
4 changed files with 41 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
core/api/current.txt
View File

@@ -10572,9 +10572,10 @@ package android.content {
public static final class ContextParams.Builder {
ctor public ContextParams.Builder();
ctor public ContextParams.Builder(@NonNull android.content.ContextParams);
method @NonNull public android.content.ContextParams build();
method @NonNull public android.content.ContextParams.Builder setAttributionTag(@NonNull String);
method @NonNull public android.content.ContextParams.Builder setReceiverPackage(@NonNull String, @Nullable String);
method @NonNull public android.content.ContextParams.Builder setAttributionTag(@Nullable String);
method @NonNull public android.content.ContextParams.Builder setReceiverPackage(@Nullable String, @Nullable String);
}
public class ContextWrapper extends android.content.Context {

2
core/api/system-current.txt
View File

@@ -2196,7 +2196,7 @@ package android.content {
}
public static final class ContextParams.Builder {
method @NonNull @RequiresPermission(android.Manifest.permission.RENOUNCE_PERMISSIONS) public android.content.ContextParams.Builder setRenouncedPermissions(@NonNull java.util.Set<java.lang.String>);
method @NonNull @RequiresPermission(android.Manifest.permission.RENOUNCE_PERMISSIONS) public android.content.ContextParams.Builder setRenouncedPermissions(@Nullable java.util.Set<java.lang.String>);
}
public class ContextWrapper extends android.content.Context {

3
core/java/android/app/ContextImpl.java
View File

@@ -2635,7 +2635,8 @@ class ContextImpl extends Context {
@Override
public @NonNull Context createAttributionContext(@Nullable String attributionTag) {
return createContext(new ContextParams.Builder().setAttributionTag(attributionTag).build());
return createContext(
new ContextParams.Builder(mParams).setAttributionTag(attributionTag).build());
}
@Override

38
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,7 +157,7 @@ public final class ContextParams {
* @return This builder.
*/
@NonNull
public Builder setAttributionTag(@NonNull String attributionTag) {
public Builder setAttributionTag(@Nullable String attributionTag) {
mAttributionTag = attributionTag;
return this;
}
@@ -140,7 +171,7 @@ public final class ContextParams {
* @return This builder.
*/
@NonNull
public Builder setReceiverPackage(@NonNull String packageName,
public Builder setReceiverPackage(@Nullable String packageName,
@Nullable String attributionTag) {
mReceiverPackage = packageName;
mReceiverAttributionTag = attributionTag;
@@ -169,7 +200,8 @@ public final class ContextParams {
*/
@SystemApi
@RequiresPermission(android.Manifest.permission.RENOUNCE_PERMISSIONS)
public @NonNull Builder setRenouncedPermissions(@NonNull Set<String> renouncedPermissions) {
public @NonNull Builder setRenouncedPermissions(
@Nullable Set<String> renouncedPermissions) {
if (renouncedPermissions != null) {
mRenouncedPermissions = Collections.unmodifiableSet(renouncedPermissions);
} else {