ModuleInfo: Address API council feedback.
Use CharSequence instead of String for package labels Bug:123587616 Test: atest ModuleInfoProviderTest Change-Id: I2ed9712aabad57c7e6325e452aa0caee19476213
This commit is contained in:
@@ -11306,7 +11306,7 @@ package android.content.pm {
|
||||
|
||||
public final class ModuleInfo implements android.os.Parcelable {
|
||||
method public int describeContents();
|
||||
method @Nullable public String getName();
|
||||
method @Nullable public CharSequence getName();
|
||||
method @Nullable public String getPackageName();
|
||||
method public boolean isHidden();
|
||||
method public void writeToParcel(android.os.Parcel, int);
|
||||
|
||||
@@ -32,7 +32,7 @@ public final class ModuleInfo implements Parcelable {
|
||||
// constructor, and writeToParcel.
|
||||
|
||||
/** Public name of this module. */
|
||||
private String mName;
|
||||
private CharSequence mName;
|
||||
|
||||
/** The package name of this module. */
|
||||
private String mPackageName;
|
||||
@@ -57,13 +57,13 @@ public final class ModuleInfo implements Parcelable {
|
||||
}
|
||||
|
||||
/** @hide Sets the public name of this module. */
|
||||
public ModuleInfo setName(String name) {
|
||||
public ModuleInfo setName(CharSequence name) {
|
||||
mName = name;
|
||||
return this;
|
||||
}
|
||||
|
||||
/** Gets the public name of this module. */
|
||||
public @Nullable String getName() {
|
||||
public @Nullable CharSequence getName() {
|
||||
return mName;
|
||||
}
|
||||
|
||||
@@ -123,13 +123,13 @@ public final class ModuleInfo implements Parcelable {
|
||||
|
||||
/** Flattens this object into the given {@link Parcel}. */
|
||||
public void writeToParcel(Parcel dest, int parcelableFlags) {
|
||||
dest.writeString(mName);
|
||||
dest.writeCharSequence(mName);
|
||||
dest.writeString(mPackageName);
|
||||
dest.writeBoolean(mHidden);
|
||||
}
|
||||
|
||||
private ModuleInfo(Parcel source) {
|
||||
mName = source.readString();
|
||||
mName = source.readCharSequence();
|
||||
mPackageName = source.readString();
|
||||
mHidden = source.readBoolean();
|
||||
}
|
||||
|
||||
@@ -138,7 +138,7 @@ public class ModuleInfoProvider {
|
||||
// to dealing with this as we'll now have to listen to all config changes and
|
||||
// regenerate the data if required. Also, is this the right way to parse a resource
|
||||
// reference out of an XML file ?
|
||||
final String moduleName = packageResources.getString(
|
||||
final CharSequence moduleName = packageResources.getText(
|
||||
Integer.parseInt(parser.getAttributeValue(null, "name").substring(1)));
|
||||
final String modulePackageName = XmlUtils.readStringAttribute(parser,
|
||||
"packageName");
|
||||
|
||||
Reference in New Issue
Block a user