diff options
| author | Anthony Stange <stange@google.com> | 2018-12-07 04:37:45 -0800 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2018-12-07 04:37:45 -0800 |
| commit | d2ca6c6dfee409fac686e7d4ab040c0f550c899f (patch) | |
| tree | cc8ca90da78c9260fe095c47073ac28050aee778 /services/java/com/android/server/SystemServer.java | |
| parent | 38d5c1e8eb32ffafcd5bd27ea5f7356dff702f47 (diff) | |
| parent | 510c8c463f4e8f28ec83f9cd41e946fde2466f96 (diff) | |
Merge "Revert "Schematize vold system properties"" am: 6ee45c6f14
am: 510c8c463f
Change-Id: If137d417a8f042e8cbde842578caaa3e54bb8c6d
Diffstat (limited to 'services/java/com/android/server/SystemServer.java')
| -rw-r--r-- | services/java/com/android/server/SystemServer.java | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/services/java/com/android/server/SystemServer.java b/services/java/com/android/server/SystemServer.java index d8b5ec542559..0d10f1e6494c 100644 --- a/services/java/com/android/server/SystemServer.java +++ b/services/java/com/android/server/SystemServer.java @@ -49,7 +49,6 @@ 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; @@ -627,7 +626,7 @@ public final class SystemServer { traceEnd(); // Only run "core" apps if we're encrypting the device. - String cryptState = VoldProperties.decrypt().orElse(""); + String cryptState = SystemProperties.get("vold.decrypt"); if (ENCRYPTING_STATE.equals(cryptState)) { Slog.w(TAG, "Detected encryption in progress - only parsing core apps"); mOnlyCore = true; |