diff options
| author | Howard Chen <howardsoc@google.com> | 2021-03-17 02:07:03 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2021-03-17 02:07:03 +0000 |
| commit | 811ad79636b04b56004d1fd910b00770adf28192 (patch) | |
| tree | 821a972f03bf19f533b08bb5b05d5fe9d41c9b6d /services/java | |
| parent | db9e849986dbe25f13a63c5f34d79de60f2a4ec9 (diff) | |
| parent | e827aec67096f1f7b0ccde8d250a0271a2c39c59 (diff) | |
Merge changes from topic "cow_pdb"
* changes:
Support copy-on-write persistent data block when running a DSU
Support PersistentDataBlockService in DSU
Diffstat (limited to 'services/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 f710f7cde471..46ec65d7567c 100644 --- a/services/java/com/android/server/SystemServer.java +++ b/services/java/com/android/server/SystemServer.java @@ -332,8 +332,6 @@ public final class SystemServer { 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; @@ -1443,8 +1441,7 @@ public final class SystemServer { 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(); |