Merge "Fix for the race in Wallpaperservice" into gingerbread (53810d70) · Commits · e / os / android_frameworks_base

core/java/android/service/wallpaper/WallpaperService.java

+13 −5

Original line number	Diff line number	Diff line
		@@ -763,6 +763,7 @@ public abstract class WallpaperService extends Service {
		}

		void detach() {
		synchronized (mLock) {
		if (mDestroyed) {
		return;
		}
		@@ -806,6 +807,7 @@ public abstract class WallpaperService extends Service {
		}
		}
		}
		}

		class IWallpaperEngineWrapper extends IWallpaperEngine.Stub
		implements HandlerCaller.Callback {
		@@ -874,13 +876,17 @@ public abstract class WallpaperService extends Service {
		}
		Engine engine = onCreateEngine();
		mEngine = engine;
		synchronized (mActiveEngines) {
		mActiveEngines.add(engine);
		}
		engine.attach(this);
		return;
		}
		case DO_DETACH: {
		mActiveEngines.remove(mEngine);
		mEngine.detach();
		synchronized (mActiveEngines) {
		mActiveEngines.remove(mEngine);
		}
		return;
		}
		case DO_SET_DESIRED_SIZE: {
		@@ -958,11 +964,13 @@ public abstract class WallpaperService extends Service {
		@Override
		public void onDestroy() {
		super.onDestroy();
		synchronized (mActiveEngines) {
		for (int i=0; i<mActiveEngines.size(); i++) {
		mActiveEngines.get(i).detach();
		}
		mActiveEngines.clear();
		}
		}

		/**
		* Implement to return the implementation of the internal accessibility