Merge "Fixed NPE when AutofillManager.getClient() returns null." into qt-dev (0aa64e17) · Commits · e / os / android_frameworks_base

core/java/android/view/autofill/AutofillManager.java

+6 −1

Original line number	Original line	Diff line number	Diff line
	@@ -3248,7 +3248,12 @@ public final class AutofillManager {
	final AutofillManager afm = mAfm.get();		final AutofillManager afm = mAfm.get();
	if (afm == null) return null;		if (afm == null) return null;

	final View view = afm.getClient().autofillClientFindViewByAutofillIdTraversal(id);		final AutofillClient client = afm.getClient();
			if (client == null) {
			Log.w(TAG, "getViewCoordinates(" + id + "): no autofill client");
			return null;
			}
			final View view = client.autofillClientFindViewByAutofillIdTraversal(id);
	if (view == null) {		if (view == null) {
	Log.w(TAG, "getViewCoordinates(" + id + "): could not find view");		Log.w(TAG, "getViewCoordinates(" + id + "): could not find view");
	return null;		return null;