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

Commit e977504e authored by Automerger Merge Worker's avatar Automerger Merge Worker
Browse files

Merge "Add an override for getUser in ContextWrapper" am: 5a049f5c am: 5d9fc934 

Change-Id: I33223887a6807d2f3caa81df3ead1caa10a015ea
parents 1bfab824 5d9fc934

core/java/android/content/ContextWrapper.java

+6 −0
Original line number Diff line number Diff line
@@ -943,6 +943,12 @@ public class ContextWrapper extends Context { 
        return mBase.getUserId();

    }



    /** @hide */

    @Override

    public UserHandle getUser() {

        return mBase.getUser();

    }



    @Override

    public Context createConfigurationContext(Configuration overrideConfiguration) {

        return mBase.createConfigurationContext(overrideConfiguration);