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

Change the app display name to app package name in RequestInfo.

Browse Source 
Test: local deployment
Bug: 247855226
Bug: 253156958
Change-Id: I37c6748776fa51997add95453b4d7f02f5c82b91
This commit is contained in:
Helen Qin
2022-11-03 03:13:03 +00:00
parent ba4d038dfb
commit 05537d6345
1 changed files with 13 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
core/java/android/credentials/ui/RequestInfo.java
View File

@@ -69,25 +69,24 @@ public class RequestInfo implements Parcelable {
private final boolean mIsFirstUsage;
// TODO: change to package name
@NonNull
private final String mAppDisplayName;
private final String mAppPackageName;
/** Creates new {@code RequestInfo} for a create-credential flow. */
public static RequestInfo newCreateRequestInfo(
@NonNull IBinder token, @NonNull CreateCredentialRequest createCredentialRequest,
boolean isFirstUsage, @NonNull String appDisplayName) {
boolean isFirstUsage, @NonNull String appPackageName) {
return new RequestInfo(
token, TYPE_CREATE, isFirstUsage, appDisplayName,
token, TYPE_CREATE, isFirstUsage, appPackageName,
createCredentialRequest, null);
}
/** Creates new {@code RequestInfo} for a get-credential flow. */
public static RequestInfo newGetRequestInfo(
@NonNull IBinder token, @NonNull GetCredentialRequest getCredentialRequest,
boolean isFirstUsage, @NonNull String appDisplayName) {
boolean isFirstUsage, @NonNull String appPackageName) {
return new RequestInfo(
token, TYPE_GET, isFirstUsage, appDisplayName,
token, TYPE_GET, isFirstUsage, appPackageName,
null, getCredentialRequest);
}
@@ -116,8 +115,8 @@ public class RequestInfo implements Parcelable {
/** Returns the display name of the app that made this request. */
@NonNull
public String getAppDisplayName() {
return mAppDisplayName;
public String getAppPackageName() {
return mAppPackageName;
}
/**
@@ -139,13 +138,13 @@ public class RequestInfo implements Parcelable {
}
private RequestInfo(@NonNull IBinder token, @NonNull @RequestType String type,
boolean isFirstUsage, @NonNull String appDisplayName,
boolean isFirstUsage, @NonNull String appPackageName,
@Nullable CreateCredentialRequest createCredentialRequest,
@Nullable GetCredentialRequest getCredentialRequest) {
mToken = token;
mType = type;
mIsFirstUsage = isFirstUsage;
mAppDisplayName = appDisplayName;
mAppPackageName = appPackageName;
mCreateCredentialRequest = createCredentialRequest;
mGetCredentialRequest = getCredentialRequest;
}
@@ -154,7 +153,7 @@ public class RequestInfo implements Parcelable {
IBinder token = in.readStrongBinder();
String type = in.readString8();
boolean isFirstUsage = in.readBoolean();
String appDisplayName = in.readString8();
String appPackageName = in.readString8();
CreateCredentialRequest createCredentialRequest =
in.readTypedObject(CreateCredentialRequest.CREATOR);
GetCredentialRequest getCredentialRequest =
@@ -165,8 +164,8 @@ public class RequestInfo implements Parcelable {
mType = type;
AnnotationValidations.validate(NonNull.class, null, mType);
mIsFirstUsage = isFirstUsage;
mAppDisplayName = appDisplayName;
AnnotationValidations.validate(NonNull.class, null, mAppDisplayName);
mAppPackageName = appPackageName;
AnnotationValidations.validate(NonNull.class, null, mAppPackageName);
mCreateCredentialRequest = createCredentialRequest;
mGetCredentialRequest = getCredentialRequest;
}
@@ -176,7 +175,7 @@ public class RequestInfo implements Parcelable {
dest.writeStrongBinder(mToken);
dest.writeString8(mType);
dest.writeBoolean(mIsFirstUsage);
dest.writeString8(mAppDisplayName);
dest.writeString8(mAppPackageName);
dest.writeTypedObject(mCreateCredentialRequest, flags);
dest.writeTypedObject(mGetCredentialRequest, flags);
}