Merge "Fix potential race in Theme creation" into oc-dev (b0a5fd03) · Commits · e / os / android_frameworks_base

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