Merge "Fix conditional for glClear call" (de83ff24) · Commits · e / os / android_frameworks_base

core/java/android/app/WallpaperManager.java

+4 −17

Original line number	Diff line number	Diff line
		@@ -221,24 +221,9 @@ public class WallpaperManager {

		private static final int MSG_CLEAR_WALLPAPER = 1;

		private final Handler mHandler;

		Globals(Looper looper) {
		IBinder b = ServiceManager.getService(Context.WALLPAPER_SERVICE);
		mService = IWallpaperManager.Stub.asInterface(b);
		mHandler = new Handler(looper) {
		@Override
		public void handleMessage(Message msg) {
		switch (msg.what) {
		case MSG_CLEAR_WALLPAPER:
		synchronized (this) {
		mWallpaper = null;
		mDefaultWallpaper = null;
		}
		break;
		}
		}
		};
		}

		public void onWallpaperChanged() {
		@@ -247,7 +232,10 @@ public class WallpaperManager {
		* to null so if the user requests the wallpaper again then we'll
		* fetch it.
		*/
		mHandler.sendEmptyMessage(MSG_CLEAR_WALLPAPER);
		synchronized (this) {
		mWallpaper = null;
		mDefaultWallpaper = null;
		}
		}

		public Bitmap peekWallpaperBitmap(Context context, boolean returnDefault) {
		@@ -280,7 +268,6 @@ public class WallpaperManager {
		synchronized (this) {
		mWallpaper = null;
		mDefaultWallpaper = null;
		mHandler.removeMessages(MSG_CLEAR_WALLPAPER);
		}
		}

+1 −1

Original line number	Diff line number	Diff line
		@@ -471,7 +471,7 @@ public class ImageWallpaper extends WallpaperService {

		checkGlError();

		if (w < 0 \|\| h < 0) {
		if (w > 0 \|\| h > 0) {
		glClearColor(0.0f, 0.0f, 0.0f, 0.0f);
		glClear(GL_COLOR_BUFFER_BIT);
		}