Merge "Frameworks: Add VMRuntime.hasBootImageSpaces check" am: 9135811848

am: b9da5284fc Change-Id: Ib02426fb94ab9fc4b448ebb5f4d928ec2cb7afbf
2018-10-11 08:59:08 -07:00
parent 367f6a2098 b9da5284fc
commit 7bd2e0ce26
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
@@ -460,6 +460,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");