Commit e93f45aa authored Jun 26, 2025 by Mythri Alle

Fix choosing the default output format in ProfilerInfo

We should choose the default format if the given input is not in the
recognized list of formats. Earlier we used an '||' instead of '&&' by
mistake.

Bug: 259258187
Test: adb shell am profile start --streaming --profiler-output-version 2 com.google.android.apps.maps /data/local/tmp/v2_1.trace
adb shell am profile stop com.google.android.apps.maps
And inspect the generated trace
Flag: EXEMPT Bug fix

Change-Id: I0e7bee7b85a3f1f317a03d2e365ff5f51b6fb609

parent 6b930544

core/java/android/app/ProfilerInfo.java

+1 −1

Original line number	Diff line number	Diff line
		@@ -163,7 +163,7 @@ public class ProfilerInfo implements Parcelable {
		public static int getFlagsForOutputVersion(int version) {
		// Only two version 1 and version 2 are supported. Just use the default if we see an unknown
		// version.
		if (version != 1 \|\| version != 2) {
		if (version != 1 && version != 2) {
		version = OUTPUT_VERSION_DEFAULT;
		}