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

Merge "Add DSU default userdata partition size" am: 59d40857ad am: 026c077b36 am: 020b636ab7

Browse Source 
Change-Id: Iced1e8097a054c73ca5d92170e23182f271a3862
This commit is contained in:
Automerger Merge Worker
2020-02-24 09:39:28 +00:00
parent 7d39562650 020b636ab7
commit ec318a1152
2 changed files with 8 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
core/java/android/os/image/DynamicSystemClient.java
View File

@@ -96,9 +96,6 @@ public class DynamicSystemClient {
private static final String TAG = "DynSystemClient";
private static final long DEFAULT_USERDATA_SIZE = (10L << 30);
/** Listener for installation status updates. */
public interface OnStatusChangedListener {
/**
@@ -386,7 +383,7 @@ public class DynamicSystemClient {
@SystemApi
@TestApi
public void start(@NonNull Uri systemUrl, @BytesLong long systemSize) {
start(systemUrl, systemSize, DEFAULT_USERDATA_SIZE);
start(systemUrl, systemSize, 0 /* Use the default userdata size */);
}
/**

7
packages/DynamicSystemInstallationService/src/com/android/dynsystem/DynamicSystemInstallationService.java
View File

@@ -82,6 +82,9 @@ public class DynamicSystemInstallationService extends Service
static final String DEFAULT_DSU_SLOT = "dsu";
static final String KEY_PUBKEY = "KEY_PUBKEY";
// Default userdata partition size is 2GiB.
private static final long DEFAULT_USERDATA_SIZE = 2L << 30;
/*
* Intent actions
*/
@@ -270,6 +273,10 @@ public class DynamicSystemInstallationService extends Service
String dsuSlot = intent.getStringExtra(KEY_DSU_SLOT);
String publicKey = intent.getStringExtra(KEY_PUBKEY);
if (userdataSize == 0) {
userdataSize = DEFAULT_USERDATA_SIZE;
}
if (TextUtils.isEmpty(dsuSlot)) {
dsuSlot = DEFAULT_DSU_SLOT;
}