commit 6dca000c174492b9391f5ce797cc3797fbb80904
author Muhammad Qureshi <muhammadq@google.com> Mon Feb 10 07:20:14 2020 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Mon Feb 10 07:20:14 2020 +0000
tree 170d5065eb9d69062f77a37899c2db300c0738e4
parent 8d0846fae1bdceeb15c89d3588650f85c64de3ae
parent 133efaa22feb223c42f7b5f2181bc938e63621ff

Merge "ServiceManager --> StatsFrameworkInitializer"

apex/statsd/framework/java/android/util/StatsLog.java

diff --git a/apex/statsd/framework/java/android/util/StatsLog.java b/apex/statsd/framework/java/android/util/StatsLog.java
index f78cf7f..511bc01 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.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 @@
         if (sService != null) {
             return sService;
         }
-        sService = IStatsd.Stub.asInterface(ServiceManager.getService("stats"));
+        sService = IStatsd.Stub.asInterface(StatsFrameworkInitializer
+            .getStatsServiceManager()
+            .getStatsdServiceRegisterer()
+            .get());
         return sService;
     }