diff options
| author | Howard Chen <howardsoc@google.com> | 2021-03-17 22:11:32 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-03-17 22:11:32 +0000 |
| commit | 8cdd0899292c2f6b56118528944a27a0b2714971 (patch) | |
| tree | 0bac487fac4c4701c95913f4fd47d5ad65bcfb54 /services/java/com/android/server/SystemServer.java | |
| parent | 717e9eeaee8346c9dbb187f6ddbb9a0997935d30 (diff) | |
| parent | 2d73582c9b0ff75abf91a93b9ec0cf6fec9649e3 (diff) | |
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
Diffstat (limited to 'services/java/com/android/server/SystemServer.java')
| -rw-r--r-- | services/java/com/android/server/SystemServer.java | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/services/java/com/android/server/SystemServer.java b/services/java/com/android/server/SystemServer.java index 592952354b8f..6f71e991bb96 100644 --- a/services/java/com/android/server/SystemServer.java +++ b/services/java/com/android/server/SystemServer.java @@ -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(); |