Merge "New trace sections for CoreStartables" into tm-qpr-dev am: 4fd49c5520

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/20306816

Change-Id: I9ed85a4e0df5a72557bc80a0c30620e788598b5e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Peter Kalauskas
2022-10-31 22:57:27 +00:00
committed by Automerger Merge Worker

View File

@@ -43,6 +43,7 @@ import com.android.internal.protolog.common.ProtoLog;
import com.android.systemui.dagger.GlobalRootComponent; import com.android.systemui.dagger.GlobalRootComponent;
import com.android.systemui.dagger.SysUIComponent; import com.android.systemui.dagger.SysUIComponent;
import com.android.systemui.dump.DumpManager; import com.android.systemui.dump.DumpManager;
import com.android.systemui.statusbar.policy.ConfigurationController;
import com.android.systemui.util.NotificationChannels; import com.android.systemui.util.NotificationChannels;
import java.util.Comparator; import java.util.Comparator;
@@ -137,7 +138,7 @@ public class SystemUIApplication extends Application implements
if (mServicesStarted) { if (mServicesStarted) {
final int N = mServices.length; final int N = mServices.length;
for (int i = 0; i < N; i++) { for (int i = 0; i < N; i++) {
mServices[i].onBootCompleted(); notifyBootCompleted(mServices[i]);
} }
} }
} }
@@ -256,7 +257,7 @@ public class SystemUIApplication extends Application implements
for (i = 0; i < mServices.length; i++) { for (i = 0; i < mServices.length; i++) {
if (mBootCompleteCache.isBootComplete()) { if (mBootCompleteCache.isBootComplete()) {
mServices[i].onBootCompleted(); notifyBootCompleted(mServices[i]);
} }
mDumpManager.registerDumpable(mServices[i].getClass().getName(), mServices[i]); mDumpManager.registerDumpable(mServices[i].getClass().getName(), mServices[i]);
@@ -267,7 +268,13 @@ public class SystemUIApplication extends Application implements
mServicesStarted = true; mServicesStarted = true;
} }
private void timeInitialization(String clsName, Runnable init, TimingsTraceLog log, private static void notifyBootCompleted(CoreStartable coreStartable) {
Trace.beginSection(coreStartable.getClass().getSimpleName() + ".onBootCompleted()");
coreStartable.onBootCompleted();
Trace.endSection();
}
private static void timeInitialization(String clsName, Runnable init, TimingsTraceLog log,
String metricsPrefix) { String metricsPrefix) {
long ti = System.currentTimeMillis(); long ti = System.currentTimeMillis();
log.traceBegin(metricsPrefix + " " + clsName); log.traceBegin(metricsPrefix + " " + clsName);
@@ -281,11 +288,13 @@ public class SystemUIApplication extends Application implements
} }
} }
private CoreStartable startAdditionalStartable(String clsName) { private static CoreStartable startAdditionalStartable(String clsName) {
CoreStartable startable; CoreStartable startable;
if (DEBUG) Log.d(TAG, "loading: " + clsName); if (DEBUG) Log.d(TAG, "loading: " + clsName);
try { try {
Trace.beginSection(clsName + ".newInstance()");
startable = (CoreStartable) Class.forName(clsName).newInstance(); startable = (CoreStartable) Class.forName(clsName).newInstance();
Trace.endSection();
} catch (ClassNotFoundException } catch (ClassNotFoundException
| IllegalAccessException | IllegalAccessException
| InstantiationException ex) { | InstantiationException ex) {
@@ -295,14 +304,19 @@ public class SystemUIApplication extends Application implements
return startStartable(startable); return startStartable(startable);
} }
private CoreStartable startStartable(String clsName, Provider<CoreStartable> provider) { private static CoreStartable startStartable(String clsName, Provider<CoreStartable> provider) {
if (DEBUG) Log.d(TAG, "loading: " + clsName); if (DEBUG) Log.d(TAG, "loading: " + clsName);
return startStartable(provider.get()); Trace.beginSection("Provider<" + clsName + ">.get()");
CoreStartable startable = provider.get();
Trace.endSection();
return startStartable(startable);
} }
private CoreStartable startStartable(CoreStartable startable) { private static CoreStartable startStartable(CoreStartable startable) {
if (DEBUG) Log.d(TAG, "running: " + startable); if (DEBUG) Log.d(TAG, "running: " + startable);
Trace.beginSection(startable.getClass().getSimpleName() + ".start()");
startable.start(); startable.start();
Trace.endSection();
return startable; return startable;
} }
@@ -340,11 +354,18 @@ public class SystemUIApplication extends Application implements
@Override @Override
public void onConfigurationChanged(Configuration newConfig) { public void onConfigurationChanged(Configuration newConfig) {
if (mServicesStarted) { if (mServicesStarted) {
mSysUIComponent.getConfigurationController().onConfigurationChanged(newConfig); ConfigurationController configController = mSysUIComponent.getConfigurationController();
Trace.beginSection(
configController.getClass().getSimpleName() + ".onConfigurationChanged()");
configController.onConfigurationChanged(newConfig);
Trace.endSection();
int len = mServices.length; int len = mServices.length;
for (int i = 0; i < len; i++) { for (int i = 0; i < len; i++) {
if (mServices[i] != null) { if (mServices[i] != null) {
Trace.beginSection(
mServices[i].getClass().getSimpleName() + ".onConfigurationChanged()");
mServices[i].onConfigurationChanged(newConfig); mServices[i].onConfigurationChanged(newConfig);
Trace.endSection();
} }
} }
} }