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

Commit 401f904e authored by Johannes Gallmann's avatar Johannes Gallmann
Browse files

Revert "Add debug logging to ImeOnBackInvokedDispatcher" 

This reverts commit 9bb8aac5.

Reason for revert: b/407224281 was fixed

Bug: 407224281
Change-Id: Ia244271a480e76ff90b47ef23fb6f50ecd789a9e
parent 9bb8aac5

core/java/android/window/ImeOnBackInvokedDispatcher.java

+0 −22
Original line number Diff line number Diff line
@@ -79,11 +79,6 @@ public class ImeOnBackInvokedDispatcher implements OnBackInvokedDispatcher, Parc 


    /** Set receiving dispatcher to consume queued receiving events. */

    public void updateReceivingDispatcher(@NonNull WindowOnBackInvokedDispatcher dispatcher) {

        if (!mQueuedReceive.isEmpty()) {

            //TODO(b/407224281): Remove this log again once b/407224281 is resolved

            Log.d(TAG, "updateReceivingDispatcher (mQueuedReceive.size=" + mQueuedReceive.size()

                    + ")");

        }

        while (!mQueuedReceive.isEmpty()) {

            final Pair<Integer, Bundle> queuedMessage = mQueuedReceive.poll();

            receive(queuedMessage.first, queuedMessage.second, dispatcher);
@@ -123,9 +118,6 @@ public class ImeOnBackInvokedDispatcher implements OnBackInvokedDispatcher, Parc 
        bundle.putInt(RESULT_KEY_PRIORITY, priority);

        bundle.putInt(RESULT_KEY_ID, callback.hashCode());

        mResultReceiver.send(RESULT_CODE_REGISTER, bundle);

        //TODO(b/407224281): Remove this log again once b/407224281 is resolved

        Log.d(TAG,

                "Send callback registration id=" + callback.hashCode() + " priority=" + priority);

    }



    @Override
@@ -134,8 +126,6 @@ public class ImeOnBackInvokedDispatcher implements OnBackInvokedDispatcher, Parc 
        Bundle bundle = new Bundle();

        bundle.putInt(RESULT_KEY_ID, callback.hashCode());

        mResultReceiver.send(RESULT_CODE_UNREGISTER, bundle);

        //TODO(b/407224281): Remove this log again once b/407224281 is resolved

        Log.d(TAG, "Send callback unregistration id=" + callback.hashCode());

    }



    @Override
@@ -197,16 +187,12 @@ public class ImeOnBackInvokedDispatcher implements OnBackInvokedDispatcher, Parc 
                    + "reregistering. (callbackId: " + callbackId

                    + " current callbacks: " + mImeCallbacks.size() + ")");

        }

        //TODO(b/407224281): Remove this log again once b/407224281 is resolved

        Log.d(TAG, "Register received callback id=" + callbackId + " priority=" + priority);

        mImeCallbacks.add(imeCallback);

        receivingDispatcher.registerOnBackInvokedCallbackUnchecked(imeCallback, priority);

    }



    private void unregisterReceivedCallback(

            int callbackId, @NonNull OnBackInvokedDispatcher receivingDispatcher) {

        //TODO(b/407224281): Remove this log again once b/407224281 is resolved

        Log.d(TAG, "Unregister received callback id=" + callbackId);

        if (!unregisterCallback(callbackId, receivingDispatcher)) {

            Log.w(TAG, "Ime callback not found. Ignoring unregisterReceivedCallback. "

                    + "callbackId: " + callbackId
@@ -237,8 +223,6 @@ public class ImeOnBackInvokedDispatcher implements OnBackInvokedDispatcher, Parc 
     * {@link ImeOnBackInvokedDispatcher#undoPreliminaryClear()}.

     */

    public void preliminaryClear() {

        //TODO(b/407224281): Remove this log again once b/407224281 is resolved

        Log.d(TAG, "Preliminary clear (mImeCallbacks.size=" + mImeCallbacks.size() + ")");

        // Unregister previously registered callbacks if there's any.

        if (getReceivingDispatcher() != null) {

            for (ImeOnBackInvokedCallback callback : mImeCallbacks) {
@@ -253,8 +237,6 @@ public class ImeOnBackInvokedDispatcher implements OnBackInvokedDispatcher, Parc 
     * animation is interrupted causing the IME to reappear.

     */

    public void undoPreliminaryClear() {

        //TODO(b/407224281): Remove this log again once b/407224281 is resolved

        Log.d(TAG, "Undo preliminary clear (mImeCallbacks.size=" + mImeCallbacks.size() + ")");

        if (getReceivingDispatcher() != null) {

            for (ImeOnBackInvokedCallback callback : mImeCallbacks) {

                getReceivingDispatcher().registerOnBackInvokedCallbackUnchecked(callback,
@@ -265,8 +247,6 @@ public class ImeOnBackInvokedDispatcher implements OnBackInvokedDispatcher, Parc 


    /** Clears all registered callbacks on the instance. */

    public void clear() {

        //TODO(b/407224281): Remove this log again once b/407224281 is resolved

        Log.d(TAG, "Clear (mImeCallbacks.size=" + mImeCallbacks.size() + ")");

        // Unregister previously registered callbacks if there's any.

        if (getReceivingDispatcher() != null) {

            for (ImeOnBackInvokedCallback callback : mImeCallbacks) {
@@ -399,8 +379,6 @@ public class ImeOnBackInvokedDispatcher implements OnBackInvokedDispatcher, Parc 
     * @param current  the currently focused {@link ViewRootImpl}.

     */

    public void switchRootView(ViewRootImpl previous, ViewRootImpl current) {

        //TODO(b/407224281): Remove this log again once b/407224281 is resolved

        Log.d(TAG, "switch root view (mImeCallbacks.size=" + mImeCallbacks.size() + ")");

        for (ImeOnBackInvokedCallback imeCallback : mImeCallbacks) {

            if (previous != null) {

                previous.getOnBackInvokedDispatcher().unregisterOnBackInvokedCallback(imeCallback);