Merge change 219

* changes: Fix a null pointer exception in DumpRenderTree (issue 1792567)
2009-04-16 11:11:14 -07:00
parent 881b9cbb4f be42388bdb
commit 0cee40e2bb
1 changed files with 2 additions and 1 deletions
--- a/tests/DumpRenderTree/src/com/android/dumprendertree/TestShellActivity.java
+++ b/tests/DumpRenderTree/src/com/android/dumprendertree/TestShellActivity.java
@@ -165,7 +165,8 @@ public class TestShellActivity extends Activity implements LayoutTestController
            if (mDialogStrings != null)
                os.write(mDialogStrings.toString().getBytes());
            mDialogStrings = null;
-            os.write(webkitData.getBytes());
+            if (webkitData != null)
+                os.write(webkitData.getBytes());
            os.flush();
            os.close();
        } catch (IOException ex) {