Merge "Fixed AutofillManager.isAutofillUiShowing()" into pi-dev

2018-03-19 18:27:20 +00:00
parent 56be97edd0 cb2e83da36
commit a946d88011
1 changed files with 1 additions and 1 deletions
--- a/core/java/android/view/autofill/AutofillManager.java
+++ b/core/java/android/view/autofill/AutofillManager.java
@@ -1413,7 +1413,7 @@ public final class AutofillManager {
     */
    public boolean isAutofillUiShowing() {
        final AutofillClient client = mContext.getAutofillClient();
-        return client != null & client.autofillClientIsFillUiShowing();
+        return client != null && client.autofillClientIsFillUiShowing();
    }

    /** @hide */