Simplify nested logic (e67c19f3) · Commits · e / os / android_frameworks_base

core/java/com/android/internal/protolog/ProtoLogImpl.java

+30 −24

Original line number	Diff line number	Diff line
		@@ -105,8 +105,18 @@ public class ProtoLogImpl {
		+ "viewerConfigPath = " + sViewerConfigPath);

		final var groups = sLogGroups.values().toArray(new IProtoLogGroup[0]);

		if (android.tracing.Flags.perfettoProtologTracing()) {
		sServiceInstance = createPerfettoProtoLogImpl(groups);
		} else {
		sServiceInstance = createLegacyProtoLogImpl(groups);
		}

		sCacheUpdater.run();
		}
		return sServiceInstance;
		}

		private static PerfettoProtoLogImpl createPerfettoProtoLogImpl(IProtoLogGroup[] groups) {
		try {
		File f = new File(sViewerConfigPath);
		if (!ProtoLog.REQUIRE_PROTOLOGTOOL && !f.exists()) {
		@@ -117,25 +127,21 @@ public class ProtoLogImpl {
		+ ProtoLogImpl.class.getSimpleName() + ". "
		+ "Setting up without a viewer config instead...");

		sServiceInstance =
		new UnprocessedPerfettoProtoLogImpl(sCacheUpdater, groups);
		return new UnprocessedPerfettoProtoLogImpl(sCacheUpdater, groups);
		} else {
		sServiceInstance = new ProcessedPerfettoProtoLogImpl(
		sViewerConfigPath, sCacheUpdater, groups);
		return new ProcessedPerfettoProtoLogImpl(sViewerConfigPath, sCacheUpdater, groups);
		}
		} catch (ServiceManager.ServiceNotFoundException e) {
		throw new RuntimeException(e);
		}
		} else {
		}

		private static LegacyProtoLogImpl createLegacyProtoLogImpl(IProtoLogGroup[] groups) {
		var protologImpl = new LegacyProtoLogImpl(
		sLegacyOutputFilePath, sLegacyViewerConfigPath, sCacheUpdater);
		protologImpl.registerGroups(groups);
		sServiceInstance = protologImpl;
		}

		sCacheUpdater.run();
		}
		return sServiceInstance;
		return protologImpl;
		}

		@VisibleForTesting