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

Commit 5d9fc934 authored by Paul Hu's avatar Paul Hu Committed by android-build-merger
Browse files

Merge "Add an override for getUser in ContextWrapper" 

am: 5a049f5c

Change-Id: Ia69ca6ab1e5f34ac3ac5a16aff8a45ac92de0f9d
parents a7c70015 5a049f5c

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