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

Commit 6467990e authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Fixed when the CompatibilityBridge is attached to an activity."

parents d86a1657 ce40498d

core/java/android/app/Activity.java

+1 −1
Original line number Diff line number Diff line
@@ -1383,6 +1383,7 @@ public class Activity extends ContextThemeWrapper 
        if (DEBUG_LIFECYCLE) Slog.v(TAG, "onResume " + this);

        getApplication().dispatchActivityResumed(this);

        mActivityTransitionState.onResume(this, isTopOfTask());

        enableAutofillCompatibilityIfNeeded();

        if (mAutoFillResetNeeded) {

            if (!mAutoFillIgnoreFirstResumePause) {

                View focus = getCurrentFocus();
@@ -7165,7 +7166,6 @@ public class Activity extends ContextThemeWrapper 
        mWindow.setColorMode(info.colorMode);



        setAutofillCompatibilityEnabled(application.isAutofillCompatibilityEnabled());

        enableAutofillCompatibilityIfNeeded();

    }



    private void enableAutofillCompatibilityIfNeeded() {

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

+4 −0
Original line number Diff line number Diff line
@@ -45,6 +45,7 @@ import android.service.autofill.UserData; 
import android.util.ArrayMap;

import android.util.ArraySet;

import android.util.Log;

import android.util.Slog;

import android.util.SparseArray;

import android.view.Choreographer;

import android.view.KeyEvent;
@@ -559,6 +560,9 @@ public final class AutofillManager { 
            // different bridge based on which activity is currently focused

            // in the current process. Since compat would be rarely used, just

            // create and register a new instance every time.

            if (sDebug) {

                Slog.d(TAG, "creating CompatibilityBridge for " + mContext);

            }

            mCompatibilityBridge = new CompatibilityBridge();

        }

    }