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

Commit 59b4baba authored by Svet Ganov's avatar Svet Ganov
Browse files

ContextWrapper should check before calling wrapped instance for autofill compat 

Test: manual

bug:73339515

Change-Id: I22cb219d6efb581d63c86de961772d948a7546da
parent 7d5beeb2

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);

        }

    }

}