Merge "Frameworks: Add VMRuntime.hasBootImageSpaces check"

am: 9135811848 Change-Id: I2832abb30bc7e96e92ac900cc84715dcab9cabc3
2018-10-11 08:44:17 -07:00
parent f7a03e7b3a 9135811848
commit b9da5284fc
1 changed files with 6 additions and 0 deletions
--- a/services/java/com/android/server/SystemServer.java
+++ b/services/java/com/android/server/SystemServer.java
@@ -459,6 +459,12 @@ public final class SystemServer {
            }
        }

+        // Diagnostic to ensure that the system is in a base healthy state. Done here as a common
+        // non-zygote process.
+        if (!VMRuntime.hasBootImageSpaces()) {
+            Slog.wtf(TAG, "Runtime is not running with a boot image!");
+        }
+
        // Loop forever.
        Looper.loop();
        throw new RuntimeException("Main thread loop unexpectedly exited");