Merge "Fix NPE from dismissing more options" into main (686d17dc) · Commits · e / os / android_frameworks_base

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

+7 −6

Original line number	Diff line number	Diff line
		@@ -5108,12 +5108,13 @@ final class Session implements RemoteFillService.FillServiceCallbacks, ViewState
		}
		}
		} else if (resultCode == FAILURE_CREDMAN_SELECTOR) {
		GetCredentialException exception = resultData.getParcelable(
		CredentialProviderService.EXTRA_GET_CREDENTIAL_EXCEPTION,
		GetCredentialException.class);
		Slog.d(TAG, "Credman bottom sheet from pinned "
		+ "entry failed with: + " + exception.getType() + " , "
		+ exception.getMessage());
		String[] exception = resultData.getStringArray(
		CredentialProviderService.EXTRA_GET_CREDENTIAL_EXCEPTION);
		if (exception != null && exception.length >= 2) {
		Slog.w(TAG, "Credman bottom sheet from pinned "
		+ "entry failed with: + " + exception[0] + " , "
		+ exception[1]);
		}
		} else {
		Slog.d(TAG, "Unknown resultCode from credential "
		+ "manager bottom sheet: " + resultCode);

+3 −0

Original line number	Diff line number	Diff line
		@@ -168,6 +168,9 @@ public class GetCandidateRequestSession extends RequestSession<GetCredentialRequ
		mRequestSessionMetric.collectFrameworkException(exception);
		if (finalResponseReceiver != null) {
		Bundle resultData = new Bundle();
		resultData.putStringArray(
		CredentialProviderService.EXTRA_GET_CREDENTIAL_EXCEPTION,
		new String[] {exception, message});
		finalResponseReceiver.send(Constants.FAILURE_CREDMAN_SELECTOR, resultData);
		} else {
		respondToClientWithErrorAndFinish(exception, message);