Merge "fix commends in last change" into main (3a25e819) · Commits · e / os / android_build

tools/aconfig/aconfig_storage_file/srcs/android/aconfig/storage/ByteBufferReader.java

+4 −0

Original line number	Original line	Diff line number	Diff line
	@@ -47,6 +47,10 @@ public class ByteBufferReader {

	public String readString() {		public String readString() {
	int length = readInt();		int length = readInt();
			if (length > 1024) {
			throw new AconfigStorageException(
			"String length exceeds maximum allowed size (1024 bytes): " + length);
			}
	byte[] bytes = new byte[length];		byte[] bytes = new byte[length];
	mByteBuffer.get(bytes, 0, length);		mByteBuffer.get(bytes, 0, length);
	return new String(bytes, StandardCharsets.UTF_8);		return new String(bytes, StandardCharsets.UTF_8);

+5 −5

Original line number	Original line	Diff line number	Diff line
	@@ -39,12 +39,12 @@ public class AconfigPackageImpl {

	/** @hide */		/** @hide */
	public static AconfigPackageImpl load(		public static AconfigPackageImpl load(
	String packageGroupName, String packageName, StorageFileProvider fileProvider) {		String container, String packageName, StorageFileProvider fileProvider) {
	if (packageGroupName == null) {		if (container == null) {
	return null;		return null;
	}		}
	AconfigPackageImpl aPackage = new AconfigPackageImpl();		AconfigPackageImpl aPackage = new AconfigPackageImpl();
	if (!aPackage.init(packageGroupName, packageName, fileProvider)) {		if (!aPackage.init(container, packageName, fileProvider)) {
	return null;		return null;
	}		}
	return aPackage;		return aPackage;
	@@ -75,9 +75,9 @@ public class AconfigPackageImpl {
	}		}

	private boolean init(		private boolean init(
	String packageGroupName, String packageName, StorageFileProvider fileProvider) {		String containerName, String packageName, StorageFileProvider fileProvider) {
	StrictMode.ThreadPolicy oldPolicy = StrictMode.allowThreadDiskReads();		StrictMode.ThreadPolicy oldPolicy = StrictMode.allowThreadDiskReads();
	String container = packageGroupName;		String container = containerName;
	try {		try {
	// for devices don't have new storage directly return		// for devices don't have new storage directly return
	if (!fileProvider.containerFileExists(null)) {		if (!fileProvider.containerFileExists(null)) {