Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am 34d723d8: Merge change I32371166 into eclair

Browse Source 
Merge commit '34d723d8fa75e8f97401311e03b3839246143018' into eclair-mr2

* commit '34d723d8fa75e8f97401311e03b3839246143018':
  Fix issue #2239203: Setting large background causes OOME and soft-reboot spiral
This commit is contained in:
Dianne Hackborn
2009-11-11 23:13:25 -08:00
committed by Android Git Automerger
parent 36818b380d 34d723d8fa
commit d669d48888
2 changed files with 23 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
core/java/com/android/internal/service/wallpaper/ImageWallpaper.java
View File

@@ -24,6 +24,7 @@ import android.graphics.drawable.Drawable;
import android.os.HandlerThread;
import android.os.Process;
import android.service.wallpaper.WallpaperService;
import android.util.Log;
import android.view.MotionEvent;
import android.view.SurfaceHolder;
import android.content.Context;
@@ -134,8 +135,8 @@ public class ImageWallpaper extends WallpaperService {
final Drawable background = mBackground;
final int dw = frame.width();
final int dh = frame.height();
final int bw = mBackground.getIntrinsicWidth();
final int bh = mBackground.getIntrinsicHeight();
final int bw = background != null ? background.getIntrinsicWidth() : 0;
final int bh = background != null ? background.getIntrinsicHeight() : 0;
final int availw = dw-bw;
final int availh = dh-bh;
int xPixels = availw < 0 ? (int)(availw*mXOffset+.5f) : (availw/2);
@@ -148,7 +149,9 @@ public class ImageWallpaper extends WallpaperService {
c.drawColor(0xff000000);
c.restore();
}
background.draw(c);
if (background != null) {
background.draw(c);
}
}
sh.unlockCanvasAndPost(c);
}
@@ -156,7 +159,11 @@ public class ImageWallpaper extends WallpaperService {
void updateWallpaper() {
synchronized (mLock) {
mBackground = mWallpaperManager.getFastDrawable();
try {
mBackground = mWallpaperManager.getFastDrawable();
} catch (RuntimeException e) {
Log.w("ImageWallpaper", "Unable to load wallpaper!", e);
}
}
}
}