From 133efaa22feb223c42f7b5f2181bc938e63621ff Mon Sep 17 00:00:00 2001
From: Muhammad Qureshi <muhammadq@google.com>
Date: Sun, 9 Feb 2020 12:36:04 -0800
Subject: [PATCH] ServiceManager --> StatsFrameworkInitializer

Bug: 149128236
Test: m
Change-Id: I6b506128b4990fa24d745da978608fe3d68a1d8f
---
 apex/statsd/framework/java/android/util/StatsLog.java | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/apex/statsd/framework/java/android/util/StatsLog.java b/apex/statsd/framework/java/android/util/StatsLog.java
index f78cf7faf94b8..511bc01f521eb 100644
--- a/apex/statsd/framework/java/android/util/StatsLog.java
+++ b/apex/statsd/framework/java/android/util/StatsLog.java
@@ -26,7 +26,7 @@ import android.annotation.SystemApi;
 import android.content.Context;
 import android.os.IStatsd;
 import android.os.RemoteException;
-import android.os.ServiceManager;
+import android.os.StatsFrameworkInitializer;
 import android.util.proto.ProtoOutputStream;
 
 import com.android.internal.util.StatsdStatsLog;
@@ -180,7 +180,10 @@ public final class StatsLog {
         if (sService != null) {
             return sService;
         }
-        sService = IStatsd.Stub.asInterface(ServiceManager.getService("stats"));
+        sService = IStatsd.Stub.asInterface(StatsFrameworkInitializer
+            .getStatsServiceManager()
+            .getStatsdServiceRegisterer()
+            .get());
         return sService;
     }