diff options
| author | Howard Chen <howardsoc@google.com> | 2021-03-17 02:34:55 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-03-17 02:34:55 +0000 |
| commit | 0680e9475789155552613636ac55cc972a495c2e (patch) | |
| tree | c6d4951e6890c01e5f38bd2c9e6491ce85e424ed /services/java/com/android/server/SystemServer.java | |
| parent | 11166d7d7142a6cf41018254192b380c7567a10f (diff) | |
| parent | 649c198cf3c5c3c436d2d66f8bd25213770f607c (diff) | |
Support PersistentDataBlockService in DSU am: 649c198cf3
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1549485
Change-Id: I29806aed4a2a9497237811b5b9b5b9ecb9b6cec8
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 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(); |