Merge "Fix crosshatch_svelte never boots."

2020-01-02 20:04:05 +00:00
parent e3212de49b e040d68a4c
commit c1ee9c7c90
1 changed files with 6 additions and 0 deletions
--- a/apex/statsd/service/java/com/android/server/stats/StatsManagerService.java
+++ b/apex/statsd/service/java/com/android/server/stats/StatsManagerService.java
@@ -95,6 +95,12 @@ public class StatsManagerService extends IStatsManagerService.Stub {
                return;
            }
            sStatsd = IStatsd.Stub.asInterface(ServiceManager.getService("stats"));
+            if (sStatsd == null) {
+                if (DEBUG) {
+                    Slog.d(TAG, "Failed to get stats service.");
+                }
+                return;
+            }
            // Assume statsd is ready since this is called form statscompanion, link to statsd.
            try {
                sStatsd.asBinder().linkToDeath((IBinder.DeathRecipient) () -> {