commit e436e18739369bfc1c4a1e9cdd42c257aabe5031
author Jean-Baptiste Queru <jbq@google.com> Mon Aug 27 12:28:45 2012 -0700
committer android code review <noreply-gerritcodereview@google.com> Mon Aug 27 12:28:45 2012 -0700
tree 713674b5a84052841b8915e981b9d5ff93f0d4a8
parent db5c3d80f4ac41b934535e401595a076ed833017
parent b0c4cab243ecaa1411aaaa0b675081e0f74e01ae

Merge "RS: Water Livewallpaper crashed after setting it to wallpaper several times."

src/com/android/wallpaper/RenderScriptWallpaper.java

diff --git a/src/com/android/wallpaper/RenderScriptWallpaper.java b/src/com/android/wallpaper/RenderScriptWallpaper.java
index 0016d33..fe1f21d 100644
--- a/src/com/android/wallpaper/RenderScriptWallpaper.java
+++ b/src/com/android/wallpaper/RenderScriptWallpaper.java
@@ -89,7 +89,7 @@
         @Override
         public void onOffsetsChanged(float xOffset, float yOffset,
                 float xStep, float yStep, int xPixels, int yPixels) {
-            mRenderer.setOffset(xOffset, yOffset, xPixels, yPixels);
+            if (mRenderer != null) mRenderer.setOffset(xOffset, yOffset, xPixels, yPixels);
         }
 
         @Override
@@ -110,7 +110,11 @@
         @Override
         public Bundle onCommand(String action, int x, int y, int z,
                 Bundle extras, boolean resultRequested) {
-            return mRenderer.onCommand(action, x, y, z, extras, resultRequested);
+            if (mRenderer != null) {
+                return mRenderer.onCommand(action, x, y, z, extras, resultRequested);
+            } else {
+                return null;
+            }
         }
 
     }