am 228bbae1: am e259566c: Put this change back, false alert with build breakage

Merge commit '228bbae1e312c525f52648d2ff4f4ed597d82a7b' into eclair-mr2-plus-aosp

* commit '228bbae1e312c525f52648d2ff4f4ed597d82a7b':
  Put this change back, false alert with build breakage
This commit is contained in:
Android Git Automerger
2009-11-13 13:11:09 -08:00

View File

@@ -72,6 +72,9 @@ public abstract class RenderScriptWallpaper<T extends RenderScriptScene> extends
@Override @Override
public void onSurfaceChanged(SurfaceHolder holder, int format, int width, int height) { public void onSurfaceChanged(SurfaceHolder holder, int format, int width, int height) {
super.onSurfaceChanged(holder, format, width, height); super.onSurfaceChanged(holder, format, width, height);
if (mRs != null) {
mRs.contextSetSurface(width, height, holder.getSurface());
}
if (mRenderer == null) { if (mRenderer == null) {
mRenderer = createScene(width, height); mRenderer = createScene(width, height);
mRenderer.init(mRs, getResources(), isPreview()); mRenderer.init(mRs, getResources(), isPreview());
@@ -95,7 +98,7 @@ public abstract class RenderScriptWallpaper<T extends RenderScriptScene> extends
while (surface == null) { while (surface == null) {
surface = holder.getSurface(); surface = holder.getSurface();
} }
mRs = new RenderScript(surface, false, false); mRs = new RenderScript(false, false);
} }
@Override @Override