Support PersistentDataBlockService in DSU am: 649c198cf3 am: 0680e94757 am: 2d73582c9b

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

Change-Id: Id11dfb6ad38e81977f4047edd289d575de9ecd3a
This commit is contained in:
Howard Chen
2021-03-17 22:11:32 +00:00
committed by Automerger Merge Worker
2 changed files with 34 additions and 11 deletions

View File

@@ -390,8 +390,6 @@ public final class SystemServer implements Dumpable {
private static final String UNCRYPT_PACKAGE_FILE = "/cache/recovery/uncrypt_file";
private static final String BLOCK_MAP_FILE = "/cache/recovery/block.map";
private static final String GSI_RUNNING_PROP = "ro.gsid.image_running";
// maximum number of binder threads used for system_server
// will be higher than the system default
private static final int sMaxBinderThreads = 31;
@@ -1662,8 +1660,7 @@ public final class SystemServer implements Dumpable {
t.traceEnd();
final boolean hasPdb = !SystemProperties.get(PERSISTENT_DATA_BLOCK_PROP).equals("");
final boolean hasGsi = SystemProperties.getInt(GSI_RUNNING_PROP, 0) > 0;
if (hasPdb && !hasGsi) {
if (hasPdb) {
t.traceBegin("StartPersistentDataBlock");
mSystemServiceManager.startService(PersistentDataBlockService.class);
t.traceEnd();