Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 9b7a3db3 authored Mar 20, 2023 by Haoran Zhang Committed by Automerger Merge Worker Mar 20, 2023

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

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/21652514

Change-Id: I52aba39c6074563999e2c6b01c5ccd2854d7ad0b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

parents d2d171f0 dcad7afa

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

+1 −1

Original line number	Diff line number	Diff line
		@@ -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

+1 −2

Original line number	Diff line number	Diff line
		@@ -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

+1 −3

Original line number	Diff line number	Diff line
		@@ -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;