diff options
| author | Treehugger Robot <treehugger-gerrit@google.com> | 2018-12-11 11:04:01 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2018-12-11 11:04:01 +0000 |
| commit | 9dfd13e7ea43e7dd11f555e6f02505fe9a90cdff (patch) | |
| tree | 3756bff0722c059f2cccd8ef68002a5c6a6d14f4 /services/java/com/android/server/SystemServer.java | |
| parent | 37ddff03853d7814a7d44f8fd98f71350bff2553 (diff) | |
| parent | 5b1cc27cee1ee1c86e7e6da8ee383ccd1ea3c785 (diff) | |
Merge "Revert "Revert "Schematize vold system properties"""
Diffstat (limited to 'services/java/com/android/server/SystemServer.java')
| -rw-r--r-- | services/java/com/android/server/SystemServer.java | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/services/java/com/android/server/SystemServer.java b/services/java/com/android/server/SystemServer.java index 80b0e6f4fca7..65ee52a0d876 100644 --- a/services/java/com/android/server/SystemServer.java +++ b/services/java/com/android/server/SystemServer.java @@ -48,6 +48,7 @@ import android.os.SystemProperties; import android.os.Trace; import android.os.UserHandle; import android.os.storage.IStorageManager; +import android.sysprop.VoldProperties; import android.util.DisplayMetrics; import android.util.EventLog; import android.util.Slog; @@ -625,7 +626,7 @@ public final class SystemServer { traceEnd(); // Only run "core" apps if we're encrypting the device. - String cryptState = SystemProperties.get("vold.decrypt"); + String cryptState = VoldProperties.decrypt().orElse(""); if (ENCRYPTING_STATE.equals(cryptState)) { Slog.w(TAG, "Detected encryption in progress - only parsing core apps"); mOnlyCore = true; |