Merge "Autofill: refactor out lint warning" into main (86e02447) · Commits · e / os / android_frameworks_base

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

+2 −7

Original line number	Original line	Diff line number	Diff line
	@@ -423,27 +423,22 @@ public final class AutofillManagerService
	@Nullable		@Nullable
	private AutofillManagerServiceImpl getServiceForUserWithLocalBinderIdentityLocked(int userId) {		private AutofillManagerServiceImpl getServiceForUserWithLocalBinderIdentityLocked(int userId) {
	final long token = Binder.clearCallingIdentity();		final long token = Binder.clearCallingIdentity();
	AutofillManagerServiceImpl managerService = null;
	try {		try {
	managerService = getServiceForUserLocked(userId);		return getServiceForUserLocked(userId);
	} finally {		} finally {
	Binder.restoreCallingIdentity(token);		Binder.restoreCallingIdentity(token);
	}		}
	return managerService;
	}		}

	@GuardedBy("mLock")		@GuardedBy("mLock")
	@Nullable		@Nullable
	private AutofillManagerServiceImpl peekServiceForUserWithLocalBinderIdentityLocked(int userId) {		private AutofillManagerServiceImpl peekServiceForUserWithLocalBinderIdentityLocked(int userId) {
	final long token = Binder.clearCallingIdentity();		final long token = Binder.clearCallingIdentity();
	AutofillManagerServiceImpl managerService = null;
	try {		try {
	managerService = peekServiceForUserLocked(userId);		return peekServiceForUserLocked(userId);
	} finally {		} finally {
	Binder.restoreCallingIdentity(token);		Binder.restoreCallingIdentity(token);
	}		}

	return managerService;
	}		}

	@Override // from AbstractMasterSystemService		@Override // from AbstractMasterSystemService