diff options
| author | Jeffrey Huang <jeffreyhuang@google.com> | 2020-01-24 02:04:06 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2020-01-24 02:04:06 +0000 |
| commit | 4329c0d2ed70065d3ceee47446e148d468baadf0 (patch) | |
| tree | 6ecc07c406bf5ddcc0d63180b9a1d738391b0fd6 /core/java/android/app/ActivityThread.java | |
| parent | 75b5b13c65f19a2905acfd9fab254ca1266021e3 (diff) | |
| parent | f58800b66a145b337537e563f1c2bea0a09cbe91 (diff) | |
Merge changes I9ea3677d,I0a59dce8
* changes:
Migrate away from using ServiceManager
Migrate StatsManager to apex
Diffstat (limited to 'core/java/android/app/ActivityThread.java')
| -rw-r--r-- | core/java/android/app/ActivityThread.java | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/core/java/android/app/ActivityThread.java b/core/java/android/app/ActivityThread.java index 2ca5b1d5c76f..48f0087f6b30 100644 --- a/core/java/android/app/ActivityThread.java +++ b/core/java/android/app/ActivityThread.java @@ -111,6 +111,8 @@ import android.os.Process; import android.os.RemoteCallback; import android.os.RemoteException; import android.os.ServiceManager; +import android.os.StatsFrameworkInitializer; +import android.os.StatsServiceManager; import android.os.StrictMode; import android.os.SystemClock; import android.os.SystemProperties; @@ -7523,6 +7525,7 @@ public final class ActivityThread extends ClientTransactionHandler { */ public static void initializeMainlineModules() { TelephonyFrameworkInitializer.setTelephonyServiceManager(new TelephonyServiceManager()); + StatsFrameworkInitializer.setStatsServiceManager(new StatsServiceManager()); } private void purgePendingResources() { |