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

Commit bc75159d authored by Felipe Leme's avatar Felipe Leme Committed by android-build-merger
Browse files

Merge "Fixed when the CompatibilityBridge is attached to an activity." into pi-dev 

am: 45fda272

Change-Id: I420b0392602e0889862c7d77e62b614e2c5617bf
parents 450cf9b9 45fda272

core/java/android/app/Activity.java

+1 −1
Original line number Diff line number Diff line
@@ -1374,6 +1374,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();
@@ -7150,7 +7151,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
@@ -44,6 +44,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;
@@ -548,6 +549,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();

        }

    }