Merge "Fix bug 5149918 - Can't call ProgressDialog.setProgressNumberFormat() before dialog is shown"

2011-08-23 17:11:33 -07:00
parent 5b56f7d6f6 5d4faa91f7
commit 0e1e5223f9
1 changed files with 1 additions and 1 deletions
--- a/core/java/android/app/ProgressDialog.java
+++ b/core/java/android/app/ProgressDialog.java
@@ -343,7 +343,7 @@ public class ProgressDialog extends AlertDialog {
    
    private void onProgressChanged() {
        if (mProgressStyle == STYLE_HORIZONTAL) {
-            if (!mViewUpdateHandler.hasMessages(0)) {
+            if (mViewUpdateHandler != null && !mViewUpdateHandler.hasMessages(0)) {
                mViewUpdateHandler.sendEmptyMessage(0);
            }
        }