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

Commit 85987667 authored by Adam Lesinski's avatar Adam Lesinski Committed by android-build-merger
Browse files

Merge "Fix potential race in Theme creation" into oc-dev 

am: b0a5fd03

Change-Id: I953ef77d43502a13bb84737956808823e9b5e30a
parents b49e79dc b0a5fd03

core/java/android/app/ContextImpl.java

+17 −11
Original line number Diff line number Diff line
@@ -256,19 +256,24 @@ class ContextImpl extends Context { 


    @Override

    public void setTheme(int resId) {

        synchronized (mSync) {

            if (mThemeResource != resId) {

                mThemeResource = resId;

                initializeTheme();

            }

        }

    }



    @Override

    public int getThemeResId() {

        synchronized (mSync) {

            return mThemeResource;

        }

    }



    @Override

    public Resources.Theme getTheme() {

        synchronized (mSync) {

            if (mTheme != null) {

                return mTheme;

            }
@@ -279,6 +284,7 @@ class ContextImpl extends Context { 


            return mTheme;

        }

    }



    private void initializeTheme() {

        if (mTheme == null) {