Merge "Add memtrackproxy system server service"

services/java/com/android/server/SystemServer.java

@@ -392,6 +392,11 @@ public final class SystemServer {
      */
     private static native void startSensorService();
 
+    /**
+     * Start the memtrack proxy service.
+     */
+    private static native void startMemtrackProxyService();
+
     /**
      * Start all HIDL services that are run inside the system server. This may take some time.
      */
@@ -830,6 +835,12 @@ public final class SystemServer {
         mSystemServiceManager.startService(UriGrantsManagerService.Lifecycle.class);
         t.traceEnd();
 
+        // Start MemtrackProxyService before ActivityManager, so that early calls
+        // to Memtrack::getMemory() don't fail.
+        t.traceBegin("MemtrackProxyService");
+        startMemtrackProxyService();
+        t.traceEnd();
+
         // Activity manager runs the show.
         t.traceBegin("StartActivityManager");
         // TODO: Might need to move after migration to WM.