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

dynsystem: Enlarge default shared memory size and allow size override am: 6287488399

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

Change-Id: I168180a7f6f0ec7ba15c74ea1bbb05db96485054
This commit is contained in:
Yi-Yo Chiang
2022-03-22 02:41:57 +00:00
committed by Automerger Merge Worker
parent 292e308e22 6287488399
commit 8ee811c412
1 changed files with 18 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
packages/DynamicSystemInstallationService/src/com/android/dynsystem/InstallationAsyncTask.java
View File

@@ -23,9 +23,11 @@ import android.os.AsyncTask;
import android.os.Build; import android.os.Build;
import android.os.MemoryFile; import android.os.MemoryFile;
import android.os.ParcelFileDescriptor; import android.os.ParcelFileDescriptor;
import android.os.SystemProperties;
import android.os.image.DynamicSystemManager; import android.os.image.DynamicSystemManager;
import android.service.persistentdata.PersistentDataBlockManager; import android.service.persistentdata.PersistentDataBlockManager;
import android.util.Log; import android.util.Log;
import android.util.Range;
import android.webkit.URLUtil; import android.webkit.URLUtil;
import org.json.JSONException; import org.json.JSONException;
@@ -48,7 +50,12 @@ class InstallationAsyncTask extends AsyncTask<String, Long, Throwable> {
private static final String TAG = "InstallationAsyncTask"; private static final String TAG = "InstallationAsyncTask";
private static final int READ_BUFFER_SIZE = 1 << 13; private static final int MIN_SHARED_MEMORY_SIZE = 8 << 10; // 8KiB
private static final int MAX_SHARED_MEMORY_SIZE = 1024 << 10; // 1MiB
private static final int DEFAULT_SHARED_MEMORY_SIZE = 64 << 10; // 64KiB
private static final String SHARED_MEMORY_SIZE_PROP =
"dynamic_system.data_transfer.shared_memory.size";
private static final long MIN_PROGRESS_TO_PUBLISH = 1 << 27; private static final long MIN_PROGRESS_TO_PUBLISH = 1 << 27;
private static final List<String> UNSUPPORTED_PARTITIONS = private static final List<String> UNSUPPORTED_PARTITIONS =
@@ -131,6 +138,7 @@ class InstallationAsyncTask extends AsyncTask<String, Long, Throwable> {
void onResult(int resultCode, Throwable detail); void onResult(int resultCode, Throwable detail);
} }
private final int mSharedMemorySize;
private final String mUrl; private final String mUrl;
private final String mDsuSlot; private final String mDsuSlot;
private final String mPublicKey; private final String mPublicKey;
@@ -164,6 +172,11 @@ class InstallationAsyncTask extends AsyncTask<String, Long, Throwable> {
Context context, Context context,
DynamicSystemManager dynSystem, DynamicSystemManager dynSystem,
ProgressListener listener) { ProgressListener listener) {
mSharedMemorySize =
Range.create(MIN_SHARED_MEMORY_SIZE, MAX_SHARED_MEMORY_SIZE)
.clamp(
SystemProperties.getInt(
SHARED_MEMORY_SIZE_PROP, DEFAULT_SHARED_MEMORY_SIZE));
mUrl = url; mUrl = url;
mDsuSlot = dsuSlot; mDsuSlot = dsuSlot;
mPublicKey = publicKey; mPublicKey = publicKey;
@@ -541,10 +554,10 @@ class InstallationAsyncTask extends AsyncTask<String, Long, Throwable> {
Log.d(TAG, "Start installing: " + partitionName); Log.d(TAG, "Start installing: " + partitionName);
MemoryFile memoryFile = new MemoryFile("dsu_" + partitionName, READ_BUFFER_SIZE); MemoryFile memoryFile = new MemoryFile("dsu_" + partitionName, mSharedMemorySize);
ParcelFileDescriptor pfd = new ParcelFileDescriptor(memoryFile.getFileDescriptor()); ParcelFileDescriptor pfd = new ParcelFileDescriptor(memoryFile.getFileDescriptor());
mInstallationSession.setAshmem(pfd, READ_BUFFER_SIZE); mInstallationSession.setAshmem(pfd, memoryFile.length());
mPartitionName = partitionName; mPartitionName = partitionName;
mPartitionSize = partitionSize; mPartitionSize = partitionSize;
@@ -553,10 +566,10 @@ class InstallationAsyncTask extends AsyncTask<String, Long, Throwable> {
long prevInstalledSize = 0; long prevInstalledSize = 0;
long installedSize = 0; long installedSize = 0;
byte[] bytes = new byte[READ_BUFFER_SIZE]; byte[] bytes = new byte[memoryFile.length()];
int numBytesRead; int numBytesRead;
while ((numBytesRead = sis.read(bytes, 0, READ_BUFFER_SIZE)) != -1) { while ((numBytesRead = sis.read(bytes, 0, bytes.length)) != -1) {
if (isCancelled()) { if (isCancelled()) {
return; return;
} }