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

Commit 1e87a365 authored by Adam Lesinski's avatar Adam Lesinski
Browse files

Fix potential race in Theme creation 

Bug: 38190555
Test: none
Change-Id: Id627bd6088dc469baffb1abb8310cd9e992996aa
parent ba003a97

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