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

Commit 41c61e59 authored by Nikita Dubrovsky's avatar Nikita Dubrovsky Committed by Automerger Merge Worker
Browse files

Merge "Remove verbose logcat messages in TextViewOnReceiveContentListener"...

Merge "Remove verbose logcat messages in TextViewOnReceiveContentListener" into sc-dev am: 75dc1f16

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

Change-Id: I91917cacbd370442dc3e5d039fa8470665166826
parents 7a2dd1ae 75dc1f16
Loading
Loading
Loading
Loading
+1 −22
Original line number Diff line number Diff line
@@ -183,15 +183,9 @@ public final class TextViewOnReceiveContentListener implements OnReceiveContentL
     */
    private static boolean isUsageOfImeCommitContentEnabled(@NonNull View view) {
        if (view.getReceiveContentMimeTypes() != null) {
            if (Log.isLoggable(LOG_TAG, Log.VERBOSE)) {
                Log.v(LOG_TAG, "Fallback to commitContent disabled (custom callback is set)");
            }
            return false;
        }
        if (Compatibility.isChangeEnabled(AUTOFILL_NON_TEXT_REQUIRES_ON_RECEIVE_CONTENT_LISTENER)) {
            if (Log.isLoggable(LOG_TAG, Log.VERBOSE)) {
                Log.v(LOG_TAG, "Fallback to commitContent disabled (target SDK is above S)");
            }
            return false;
        }
        return true;
@@ -222,10 +216,6 @@ public final class TextViewOnReceiveContentListener implements OnReceiveContentL
     */
    void setInputConnectionInfo(@NonNull TextView view, @NonNull InputConnection ic,
            @NonNull EditorInfo editorInfo) {
        if (Log.isLoggable(LOG_TAG, Log.VERBOSE)) {
            Log.v(LOG_TAG, "setInputConnectionInfo: "
                    + Arrays.toString(editorInfo.contentMimeTypes));
        }
        if (!isUsageOfImeCommitContentEnabled(view)) {
            mInputConnectionInfo = null;
            return;
@@ -243,9 +233,6 @@ public final class TextViewOnReceiveContentListener implements OnReceiveContentL
     * callback instance.
     */
    void clearInputConnectionInfo() {
        if (Log.isLoggable(LOG_TAG, Log.VERBOSE)) {
            Log.v(LOG_TAG, "clearInputConnectionInfo: " + mInputConnectionInfo);
        }
        mInputConnectionInfo = null;
    }

@@ -265,17 +252,9 @@ public final class TextViewOnReceiveContentListener implements OnReceiveContentL
        }
        final InputConnectionInfo icInfo = mInputConnectionInfo;
        if (icInfo == null) {
            if (Log.isLoggable(LOG_TAG, Log.VERBOSE)) {
                Log.v(LOG_TAG, "getEditorInfoMimeTypes: No usable EditorInfo");
            }
            return null;
        }
        final String[] editorInfoContentMimeTypes = icInfo.mEditorInfoContentMimeTypes;
        if (Log.isLoggable(LOG_TAG, Log.VERBOSE)) {
            Log.v(LOG_TAG, "getEditorInfoMimeTypes: "
                    + Arrays.toString(editorInfoContentMimeTypes));
        }
        return editorInfoContentMimeTypes;
        return icInfo.mEditorInfoContentMimeTypes;
    }

    /**