Merge "Fix reset field classification service command." into udc-dev

services/autofill/java/com/android/server/autofill/AutofillManagerService.java

@@ -383,7 +383,7 @@ public final class AutofillManagerService
             final AutofillManagerServiceImpl service = peekServiceForUserLocked(userId);
             if (service == null) {
                 // If we cannot get the service from the services cache, it will call
-                // updateRemoteAugmentedAutofillService() finally. Skip call this update again.
+                // updateRemoteFieldClassificationService() finally. Skip call this update again.
                 getServiceForUserLocked(userId);
             } else {
                 service.updateRemoteFieldClassificationService();

services/autofill/java/com/android/server/autofill/AutofillManagerServiceImpl.java

@@ -1731,7 +1731,7 @@ final class AutofillManagerServiceImpl
     }
 
     /**
-     * Called when the {@link AutofillManagerService#mAugmentedAutofillResolver}
+     * Called when the {@link AutofillManagerService#mFieldClassificationResolver}
      * changed (among other places).
      */
     void updateRemoteFieldClassificationService() {
@@ -1742,7 +1742,6 @@ final class AutofillManagerServiceImpl
                             + "destroying old remote service");
                 }
                 mRemoteFieldClassificationService.unbind();
-
                 mRemoteFieldClassificationService = null;
                 mRemoteFieldClassificationServiceInfo = null;
             }

services/autofill/java/com/android/server/autofill/AutofillManagerServiceShellCommand.java

@@ -327,13 +327,11 @@ public final class AutofillManagerServiceShellCommand extends ShellCommand {
     private int setTemporaryDetectionService(PrintWriter pw) {
         final int userId = getNextIntArgRequired();
         final String serviceName = getNextArg();
-        final int duration = getNextIntArgRequired();
-
         if (serviceName == null) {
             mService.resetTemporaryDetectionService(userId);
             return 0;
         }
-
+        final int duration = getNextIntArgRequired();
         if (duration <= 0) {
             mService.resetTemporaryDetectionService(userId);
             return 0;