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

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

Merge "Don't call setAutofillClient() on base Context if it's null." into pi-dev 

am: 6d084215

Change-Id: Ifc971e81483b5bcf08c6f0af9789b88905dc17ad
parents b098a03e 6d084215

core/java/android/app/Activity.java

+3 −1
Original line number Diff line number Diff line
@@ -979,8 +979,10 @@ public class Activity extends ContextThemeWrapper 
    @Override

    protected void attachBaseContext(Context newBase) {

        super.attachBaseContext(newBase);

        if (newBase != null) {

            newBase.setAutofillClient(this);

        }

    }



    /** @hide */

    @Override