Normalize parameter name comments

PiperOrigin-RevId: 194512971

13 files changed, 32 insertions, 31 deletions

diff --git a/src/tools/android/java/com/google/devtools/build/android/Aapt2ResourcePackagingAction.java b/src/tools/android/java/com/google/devtools/build/android/Aapt2ResourcePackagingAction.java
index 3ec965067b..025533ee6a 100644
--- a/src/tools/android/java/com/google/devtools/build/android/Aapt2ResourcePackagingAction.java
+++ b/src/tools/android/java/com/google/devtools/build/android/Aapt2ResourcePackagingAction.java
@@ -104,7 +104,7 @@ public class Aapt2ResourcePackagingAction {
                   null /* cruncher. Aapt2 automatically chooses to crunch or not. */,
                   options.packageType,
                   options.symbolsOut,
-                  null /* rclassWriter */,
+                  /* rclassWriter= */ null,
                   dataDeserializer,
                   options.throwOnResourceConflict,
                   executorService)
@@ -185,13 +185,13 @@ public class Aapt2ResourcePackagingAction {
         profiler.recordEndOf("link");
         if (options.resourcesOutput != null) {
           profiler.startTask("package");
-          // The compiled resources and the merged resources should be the same.
-          // TODO(corysmith): Decompile or otherwise provide the exact resources in the apk.
-          ResourcesZip.fromApk(
-                  mergedAndroidData.getResourceDir(),
-                  packagedResources.getApk(),
-                  packagedResources.getResourceIds())
-              .writeTo(options.resourcesOutput, false /* compress */);
+        // The compiled resources and the merged resources should be the same.
+        // TODO(corysmith): Decompile or otherwise provide the exact resources in the apk.
+        ResourcesZip.fromApk(
+                mergedAndroidData.getResourceDir(),
+                packagedResources.getApk(),
+                packagedResources.getResourceIds())
+            .writeTo(options.resourcesOutput, /* compress= */ false);
           profiler.recordEndOf("package");
         }
       }
diff --git a/src/tools/android/java/com/google/devtools/build/android/AndroidAssetMergingAction.java b/src/tools/android/java/com/google/devtools/build/android/AndroidAssetMergingAction.java
index 98081c72b0..aa74a7405a 100644
--- a/src/tools/android/java/com/google/devtools/build/android/AndroidAssetMergingAction.java
+++ b/src/tools/android/java/com/google/devtools/build/android/AndroidAssetMergingAction.java
@@ -148,7 +148,7 @@ public class AndroidAssetMergingAction extends AbstractBusyBoxAction {
         "The asset merging action should not produce non-asset merge results!");
 
     ResourcesZip.from(ignored, mergedData.getAssetDir())
-        .writeTo(options.assetsOutput, true /* compress */);
+        .writeTo(options.assetsOutput, /* compress= */ true);
     logCompletion("Create assets zip");
   }
 
diff --git a/src/tools/android/java/com/google/devtools/build/android/AndroidManifestProcessor.java b/src/tools/android/java/com/google/devtools/build/android/AndroidManifestProcessor.java
index f870d6c7df..c65bc98880 100644
--- a/src/tools/android/java/com/google/devtools/build/android/AndroidManifestProcessor.java
+++ b/src/tools/android/java/com/google/devtools/build/android/AndroidManifestProcessor.java
@@ -271,8 +271,8 @@ public class AndroidManifestProcessor {
 
     if (newManifestPackage != null) {
       processManifest(
-          -1 /* versionCode */,
-          null /* versionName */,
+          /* versionCode= */ -1,
+          /* versionName= */ null,
           manifest,
           processedManifest,
           MergeType.LIBRARY,
diff --git a/src/tools/android/java/com/google/devtools/build/android/AndroidResourceClassWriter.java b/src/tools/android/java/com/google/devtools/build/android/AndroidResourceClassWriter.java
index b9458fb05b..f5ba7dc9b7 100644
--- a/src/tools/android/java/com/google/devtools/build/android/AndroidResourceClassWriter.java
+++ b/src/tools/android/java/com/google/devtools/build/android/AndroidResourceClassWriter.java
@@ -101,10 +101,11 @@ public class AndroidResourceClassWriter implements Flushable, AndroidResourceSym
   }
 
   private void writeAsJava(FieldInitializers initializers) throws IOException {
-    RSourceGenerator.with(outputBasePath, initializers, false /* finalFields */).write(packageName);
+    RSourceGenerator.with(outputBasePath, initializers, /* finalFields= */ false)
+        .write(packageName);
   }
 
   private void writeAsClass(FieldInitializers initializers) throws IOException {
-    RClassGenerator.with(outputBasePath, initializers, false /* finalFields */).write(packageName);
+    RClassGenerator.with(outputBasePath, initializers, /* finalFields= */ false).write(packageName);
   }
 }
diff --git a/src/tools/android/java/com/google/devtools/build/android/AndroidResourceMerger.java b/src/tools/android/java/com/google/devtools/build/android/AndroidResourceMerger.java
index 2b63b5647b..f77c4e1b92 100644
--- a/src/tools/android/java/com/google/devtools/build/android/AndroidResourceMerger.java
+++ b/src/tools/android/java/com/google/devtools/build/android/AndroidResourceMerger.java
@@ -162,7 +162,7 @@ public class AndroidResourceMerger {
           cruncher,
           type,
           symbolsOut,
-          null /* rclassWriter */,
+          /* rclassWriter= */ null,
           AndroidParsedDataDeserializer.withFilteredResources(filteredResources),
           throwOnResourceConflict,
           executorService);
diff --git a/src/tools/android/java/com/google/devtools/build/android/AndroidResourceMergingAction.java b/src/tools/android/java/com/google/devtools/build/android/AndroidResourceMergingAction.java
index cbd53a512e..9b9b87f308 100644
--- a/src/tools/android/java/com/google/devtools/build/android/AndroidResourceMergingAction.java
+++ b/src/tools/android/java/com/google/devtools/build/android/AndroidResourceMergingAction.java
@@ -278,9 +278,9 @@ public class AndroidResourceMergingAction {
                 .processManifest(
                     packageType,
                     options.packageForR,
-                    null, /* applicationId */
-                    -1, /* versionCode */
-                    null, /* versionName */
+                    /* applicationId= */ null,
+                    /* versionCode= */ -1,
+                    /* versionName= */ null,
                     mergedData,
                     processedManifest);
         AndroidResourceOutputs.copyManifestToOutput(processedData, options.manifestOutput);
@@ -311,7 +311,7 @@ public class AndroidResourceMergingAction {
         // For now, try compressing the library resources that we pass to the validator. This takes
         // extra CPU resources to pack and unpack (~2x), but can reduce the zip size (~4x).
         ResourcesZip.from(resourcesDir, mergedData.getAssetDir())
-            .writeTo(options.resourcesOutput, true /* compress */);
+            .writeTo(options.resourcesOutput, /* compress= */ true);
         logger.fine(
             String.format(
                 "Create resources.zip finished at %sms", timer.elapsed(TimeUnit.MILLISECONDS)));
diff --git a/src/tools/android/java/com/google/devtools/build/android/AndroidResourceProcessingAction.java b/src/tools/android/java/com/google/devtools/build/android/AndroidResourceProcessingAction.java
index 0a4a275de9..18dd20381c 100644
--- a/src/tools/android/java/com/google/devtools/build/android/AndroidResourceProcessingAction.java
+++ b/src/tools/android/java/com/google/devtools/build/android/AndroidResourceProcessingAction.java
@@ -535,7 +535,7 @@ public class AndroidResourceProcessingAction {
         }
 
         ResourcesZip.from(processedAndroidData.getResourceDir(), processedAndroidData.getAssetDir())
-            .writeTo(options.resourcesOutput, false /* compress */);
+            .writeTo(options.resourcesOutput, /* compress= */ false);
       }
       logger.fine(
           String.format("Packaging finished at %sms", timer.elapsed(TimeUnit.MILLISECONDS)));
diff --git a/src/tools/android/java/com/google/devtools/build/android/AndroidResourceProcessor.java b/src/tools/android/java/com/google/devtools/build/android/AndroidResourceProcessor.java
index f995a7a370..ddbfa18a6c 100644
--- a/src/tools/android/java/com/google/devtools/build/android/AndroidResourceProcessor.java
+++ b/src/tools/android/java/com/google/devtools/build/android/AndroidResourceProcessor.java
@@ -299,7 +299,7 @@ public class AndroidResourceProcessor {
             variantType,
             customPackageForR,
             androidManifest,
-            true /* shouldZipDataBindingInfo */);
+            /* shouldZipDataBindingInfo= */ true);
 
     final Path assetsDir = primaryData.getAssetDir();
     if (publicResourcesOut != null) {
@@ -593,7 +593,7 @@ public class AndroidResourceProcessor {
       // Loop on all the package name, merge all the symbols to write, and write.
       for (String packageName : libSymbolMap.keySet()) {
         Collection<ResourceSymbols> symbols = libSymbolMap.get(packageName);
-        fullSymbolValues.writeSourcesTo(sourceOut, packageName, symbols, true /* finalFields */);
+        fullSymbolValues.writeSourcesTo(sourceOut, packageName, symbols, /* finalFields= */ true);
       }
     }
   }
diff --git a/src/tools/android/java/com/google/devtools/build/android/AndroidResourceValidatorAction.java b/src/tools/android/java/com/google/devtools/build/android/AndroidResourceValidatorAction.java
index 23f1671a07..b960c8c952 100644
--- a/src/tools/android/java/com/google/devtools/build/android/AndroidResourceValidatorAction.java
+++ b/src/tools/android/java/com/google/devtools/build/android/AndroidResourceValidatorAction.java
@@ -168,9 +168,9 @@ public class AndroidResourceValidatorAction {
           assets,
           generatedSources,
           options.packagePath,
-          null, /* proguardOut */
-          null, /* mainDexProguardOut */
-          null /* publicResourcesOut */);
+          /* proguardOut= */ null,
+          /* mainDexProguardOut= */ null,
+          /* publicResourcesOut= */ null);
       logger.fine(String.format("aapt finished at %sms", timer.elapsed(TimeUnit.MILLISECONDS)));
 
       AndroidResourceOutputs.copyRToOutput(
diff --git a/src/tools/android/java/com/google/devtools/build/android/RClassGeneratorAction.java b/src/tools/android/java/com/google/devtools/build/android/RClassGeneratorAction.java
index ff3256d6ae..2c1f96fa4d 100644
--- a/src/tools/android/java/com/google/devtools/build/android/RClassGeneratorAction.java
+++ b/src/tools/android/java/com/google/devtools/build/android/RClassGeneratorAction.java
@@ -169,7 +169,7 @@ public class RClassGeneratorAction {
             String.format("Load symbols finished at %sms", timer.elapsed(TimeUnit.MILLISECONDS)));
         // For now, assuming not used for libraries and setting final access for fields.
         fullSymbolValues.writeClassesTo(
-            libSymbolMap, appPackageName, classOutPath, true /* finalFields */);
+            libSymbolMap, appPackageName, classOutPath, /* finalFields= */ true);
         logger.fine(
             String.format("Finished R.class at %sms", timer.elapsed(TimeUnit.MILLISECONDS)));
       } else if (!options.libraries.isEmpty()) {
@@ -179,7 +179,7 @@ public class RClassGeneratorAction {
         logger.fine(
             String.format("Load symbols finished at %sms", timer.elapsed(TimeUnit.MILLISECONDS)));
         // For now, assuming not used for libraries and setting final access for fields.
-        fullSymbolValues.writeClassesTo(libSymbolMap, null, classOutPath, true /* finalFields */);
+        fullSymbolValues.writeClassesTo(libSymbolMap, null, classOutPath, /* finalFields= */ true);
         logger.fine(
             String.format("Finished R.class at %sms", timer.elapsed(TimeUnit.MILLISECONDS)));
       } else {
diff --git a/src/tools/android/java/com/google/devtools/build/android/ResourceShrinkerAction.java b/src/tools/android/java/com/google/devtools/build/android/ResourceShrinkerAction.java
index 57193f0f7f..81bfb7349d 100644
--- a/src/tools/android/java/com/google/devtools/build/android/ResourceShrinkerAction.java
+++ b/src/tools/android/java/com/google/devtools/build/android/ResourceShrinkerAction.java
@@ -309,11 +309,11 @@ public class ResourceShrinkerAction {
           options.shrunkApk,
           null /* proguardOutput */,
           null /* mainDexProguardOutput */,
-          null /* publicResourcesOut */,
-          null /* dataBindingInfoOut */);
+          /* publicResourcesOut= */ null,
+          /* dataBindingInfoOut= */ null);
       if (options.shrunkResources != null) {
         ResourcesZip.from(shrunkResources, resourceFiles.resolve("assets"))
-            .writeTo(options.shrunkResources, false /* compress */);
+            .writeTo(options.shrunkResources, /* compress= */ false);
       }
       if (options.rTxtOutput != null) {
         AndroidResourceOutputs.copyRToOutput(
diff --git a/src/tools/android/java/com/google/devtools/build/android/ResourcesZip.java b/src/tools/android/java/com/google/devtools/build/android/ResourcesZip.java
index 3b6b160f54..3c599e4279 100644
--- a/src/tools/android/java/com/google/devtools/build/android/ResourcesZip.java
+++ b/src/tools/android/java/com/google/devtools/build/android/ResourcesZip.java
@@ -84,7 +84,7 @@ public class ResourcesZip {
   public static ResourcesZip fromApk(Path resourcesRoot, Path apkWithAssets, Path resourceIds) {
     return new ResourcesZip(
         resourcesRoot,
-        null /* assetsRoot */,
+        /* assetsRoot= */ null,
         Optional.of(resourceIds).filter(Files::exists),
         Optional.of(apkWithAssets));
   }
diff --git a/src/tools/android/java/com/google/devtools/build/android/aapt2/ResourceLinker.java b/src/tools/android/java/com/google/devtools/build/android/aapt2/ResourceLinker.java
index c2bfc60abe..adaeabbe72 100644
--- a/src/tools/android/java/com/google/devtools/build/android/aapt2/ResourceLinker.java
+++ b/src/tools/android/java/com/google/devtools/build/android/aapt2/ResourceLinker.java
@@ -224,7 +224,7 @@ public class ResourceLinker {
       }
 
       profiler.startTask("sourcejar");
-      AndroidResourceOutputs.createSrcJar(javaSourceDirectory, sourceJar, true /* staticIds */);
+      AndroidResourceOutputs.createSrcJar(javaSourceDirectory, sourceJar, /* staticIds= */ true);
       profiler.recordEndOf("sourcejar");
       return StaticLibrary.from(outPath, rTxt, ImmutableList.of(), sourceJar);
     } catch (IOException e) {