From e040d68a4c6349f3d8e2745dbc2883ee660ccf61 Mon Sep 17 00:00:00 2001
From: Rajeev Kumar <rajekumar@google.com>
Date: Thu, 26 Dec 2019 15:28:57 -0800
Subject: [PATCH] Fix crosshatch_svelte never boots.

Added a null check for stats service. This check is required because
stats service might not be able available on few devices.

Bug: 146903418
Test: Built crosshatch_svelte image and flashed a device. It booted
successfully.

Change-Id: I1827cf1e9b66a1a490c5dc8514b0855d813197ac
---
 .../java/com/android/server/stats/StatsManagerService.java  | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/apex/statsd/service/java/com/android/server/stats/StatsManagerService.java b/apex/statsd/service/java/com/android/server/stats/StatsManagerService.java
index f3bf9099c8935..24b7978506d04 100644
--- 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) () -> {