Bug 1834576 - Update googleJavaFormat to version 1.17.0. r=geckoview-reviewers,calu (7d276a8c) · Commits · The Tor Project / Applications / Tor Browser

build.gradle

+1 −1

Original line number	Diff line number	Diff line
		@@ -360,7 +360,7 @@ subprojects {
		include '*/.java'
		exclude '/thirdparty/'
		}
		googleJavaFormat('1.15.0')
		googleJavaFormat('1.17.0')
		}
		kotlin {
		target project.fileTree(project.projectDir) {

+1 −0

Original line number	Diff line number	Diff line
		@@ -49,6 +49,7 @@ public class AndroidGamepadManager {
		}

		private static final int FIRST_DPAD_BUTTON = 12;

		// A list of axis number, gamepad button mappings for negative, positive.
		// Button mappings are added to FIRST_DPAD_BUTTON.
		private static enum DpadAxis {

+5 −0

Original line number	Diff line number	Diff line
		@@ -536,10 +536,13 @@ public class GeckoAppShell {

		/** Wake-lock for the CPU. */
		static final String WAKE_LOCK_CPU = "cpu";

		/** Wake-lock for the screen. */
		static final String WAKE_LOCK_SCREEN = "screen";

		/** Wake-lock for the audio-playing, eqaul to LOCK_CPU. */
		static final String WAKE_LOCK_AUDIO_PLAYING = "audio-playing";

		/** Wake-lock for the video-playing, eqaul to LOCK_SCREEN.. */
		static final String WAKE_LOCK_VIDEO_PLAYING = "video-playing";

		@@ -547,8 +550,10 @@ public class GeckoAppShell {

		/** No one holds the wake-lock. */
		static final int WAKE_LOCK_STATE_UNLOCKED = 0;

		/** The wake-lock is held by a foreground window. */
		static final int WAKE_LOCK_STATE_LOCKED_FOREGROUND = 1;

		/** The wake-lock is held by a background window. */
		static final int WAKE_LOCK_STATE_LOCKED_BACKGROUND = 2;

+6 −0

Original line number	Diff line number	Diff line
		@@ -51,6 +51,7 @@ public class GeckoJavaSampler {
		* https://searchfox.org/mozilla-central/rev/d4ebb53e719b913afdbcf7c00e162f0e96574701/mozglue/baseprofiler/public/BaseProfilerUtils.h#194
		*/
		private static final long REPLACEMENT_MAIN_THREAD_ID = 1;

		/**
		* The thread name to use for the main thread instead of its true thread name. The name is "main",
		* which is ambiguous with the JS main thread, so we rename it to match the C++ replacement. We
		@@ -177,20 +178,25 @@ public class GeckoJavaSampler {

		/** Name of the marker */
		private final String mMarkerName;

		/** Either start time for the duration markers or time for a point-in-time markers. */
		private final double mTime;

		/**
		* A fallback field of {@link #mTime} but it only exists when {@link #getProfilerTime()} is
		* failed. It is non-zero if Android time is used.
		*/
		private final long mJavaTime;

		/** End time for the duration markers. It's zero for point-in-time markers. */
		private final double mEndTime;

		/**
		* A fallback field of {@link #mEndTime} but it only exists when {@link #getProfilerTime()} is
		* failed. It is non-zero if Android time is used.
		*/
		private final long mEndJavaTime;

		/** A nullable additional information field for the marker. */
		private @Nullable final String mText;

+1 −0

Original line number	Diff line number	Diff line
		@@ -39,6 +39,7 @@ public interface AsyncCodec {
		public abstract void stop();

		public abstract void flush();

		// Must be called after flush().
		public abstract void resumeReceivingInputs();