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

Merge "Revise the return type of #getLabel"

Browse Source
This commit is contained in:
Jackal Guo
2022-11-01 03:59:19 +00:00
committed by Android (Google) Code Review
parent 73ffa86985 0ac143f39b
commit 62185c378a
3 changed files with 12 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
core/api/current.txt
View File

@@ -11654,7 +11654,7 @@ package android.content.pm {
public static final class PackageInstaller.PreapprovalDetails implements android.os.Parcelable {
method public int describeContents();
method @Nullable public android.graphics.Bitmap getIcon();
method @NonNull public String getLabel();
method @NonNull public CharSequence getLabel();
method @NonNull public android.icu.util.ULocale getLocale();
method @NonNull public String getPackageName();
method public void writeToParcel(@NonNull android.os.Parcel, int);
@@ -11665,7 +11665,7 @@ package android.content.pm {
ctor public PackageInstaller.PreapprovalDetails.Builder();
method @NonNull public android.content.pm.PackageInstaller.PreapprovalDetails build();
method @NonNull public android.content.pm.PackageInstaller.PreapprovalDetails.Builder setIcon(@NonNull android.graphics.Bitmap);
method @NonNull public android.content.pm.PackageInstaller.PreapprovalDetails.Builder setLabel(@NonNull String);
method @NonNull public android.content.pm.PackageInstaller.PreapprovalDetails.Builder setLabel(@NonNull CharSequence);
method @NonNull public android.content.pm.PackageInstaller.PreapprovalDetails.Builder setLocale(@NonNull android.icu.util.ULocale);
method @NonNull public android.content.pm.PackageInstaller.PreapprovalDetails.Builder setPackageName(@NonNull String);
}

18
core/java/android/content/pm/PackageInstaller.java
View File

@@ -3346,7 +3346,7 @@ public class PackageInstaller {
/**
* The label representing the app to be installed.
*/
private final @NonNull String mLabel;
private final @NonNull CharSequence mLabel;
/**
* The locale of the app label being used.
*/
@@ -3388,7 +3388,7 @@ public class PackageInstaller {
@DataClass.Generated.Member
public PreapprovalDetails(
@Nullable Bitmap icon,
@NonNull String label,
@NonNull CharSequence label,
@NonNull ULocale locale,
@NonNull String packageName) {
this.mIcon = icon;
@@ -3417,7 +3417,7 @@ public class PackageInstaller {
* The label representing the app to be installed.
*/
@DataClass.Generated.Member
public @NonNull String getLabel() {
public @NonNull CharSequence getLabel() {
return mLabel;
}
@@ -3461,7 +3461,7 @@ public class PackageInstaller {
if (mIcon != null) flg |= 0x1;
dest.writeByte(flg);
if (mIcon != null) mIcon.writeToParcel(dest, flags);
dest.writeString8(mLabel);
dest.writeCharSequence(mLabel);
dest.writeString8(mLocale.toString());
dest.writeString8(mPackageName);
}
@@ -3479,7 +3479,7 @@ public class PackageInstaller {
byte flg = in.readByte();
Bitmap icon = (flg & 0x1) == 0 ? null : Bitmap.CREATOR.createFromParcel(in);
String label = in.readString8();
CharSequence label = (CharSequence) in.readCharSequence();
ULocale locale = new ULocale(in.readString8());
String packageName = in.readString8();
@@ -3519,7 +3519,7 @@ public class PackageInstaller {
public static final class Builder {
private @Nullable Bitmap mIcon;
private @NonNull String mLabel;
private @NonNull CharSequence mLabel;
private @NonNull ULocale mLocale;
private @NonNull String mPackageName;
@@ -3545,7 +3545,7 @@ public class PackageInstaller {
* The label representing the app to be installed.
*/
@DataClass.Generated.Member
public @NonNull Builder setLabel(@NonNull String value) {
public @NonNull Builder setLabel(@NonNull CharSequence value) {
checkNotUsed();
mBuilderFieldsSet |= 0x2;
mLabel = value;
@@ -3596,10 +3596,10 @@ public class PackageInstaller {
}
@DataClass.Generated(
time = 1664257135109L,
time = 1666748098353L,
codegenVersion = "1.0.23",
sourceFile = "frameworks/base/core/java/android/content/pm/PackageInstaller.java",
inputSignatures = "private final @android.annotation.Nullable android.graphics.Bitmap mIcon\nprivate final @android.annotation.NonNull java.lang.String mLabel\nprivate final @android.annotation.NonNull android.icu.util.ULocale mLocale\nprivate final @android.annotation.NonNull java.lang.String mPackageName\nclass PreapprovalDetails extends java.lang.Object implements [android.os.Parcelable]\n@com.android.internal.util.DataClass(genParcelable=true, genHiddenConstructor=true, genBuilder=true, genToString=true)")
inputSignatures = "private final @android.annotation.Nullable android.graphics.Bitmap mIcon\nprivate final @android.annotation.NonNull java.lang.CharSequence mLabel\nprivate final @android.annotation.NonNull android.icu.util.ULocale mLocale\nprivate final @android.annotation.NonNull java.lang.String mPackageName\nclass PreapprovalDetails extends java.lang.Object implements [android.os.Parcelable]\n@com.android.internal.util.DataClass(genParcelable=true, genHiddenConstructor=true, genBuilder=true, genToString=true)")
@Deprecated
private void __metadata() {}

2
services/core/java/com/android/server/pm/PackageInstallerSession.java
View File

@@ -3326,7 +3326,7 @@ public class PackageInstallerSession extends IPackageInstallerSession.Stub {
"Failure to obtain package info.");
}
final List<String> filePaths = packageLite.getAllApkPaths();
final String appLabel = mPreapprovalDetails.getLabel();
final CharSequence appLabel = mPreapprovalDetails.getLabel();
final ULocale appLocale = mPreapprovalDetails.getLocale();
final ApplicationInfo appInfo = packageInfo.applicationInfo;
boolean appLabelMatched = false;