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

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

Merge "ContextWrapper should check before calling wrapped instance for autofill compat"

parents a654f06d 59b4baba

core/java/android/content/ContextWrapper.java

+4 −2
Original line number Diff line number Diff line
@@ -1000,7 +1000,7 @@ public class ContextWrapper extends Context { 
     */

    @Override

    public boolean isAutofillCompatibilityEnabled() {

        return mBase.isAutofillCompatibilityEnabled();

        return mBase != null && mBase.isAutofillCompatibilityEnabled();

    }



    /**
@@ -1008,6 +1008,8 @@ public class ContextWrapper extends Context { 
     */

    @Override

    public void setAutofillCompatibilityEnabled(boolean  autofillCompatEnabled) {

        if (mBase != null) {

            mBase.setAutofillCompatibilityEnabled(autofillCompatEnabled);

        }

    }

}