diff options
Diffstat (limited to 'services/java/com/android/server/SystemServer.java')
| -rw-r--r-- | services/java/com/android/server/SystemServer.java | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/services/java/com/android/server/SystemServer.java b/services/java/com/android/server/SystemServer.java index fbf677dd0967..9b2a1e7a4e07 100644 --- a/services/java/com/android/server/SystemServer.java +++ b/services/java/com/android/server/SystemServer.java @@ -454,6 +454,11 @@ public final class SystemServer implements Dumpable { 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. */ private static native void startHidlServices(); @@ -1024,6 +1029,12 @@ public final class SystemServer implements Dumpable { mSystemServiceManager.startService(PowerStatsService.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. |