commit c52a78cba9ea666a0a91c372943862cbfdd35caf
author Yorke Lee <yorkelee@google.com> Tue Mar 25 14:34:59 2014 +0000
committer Android Git Automerger <android-git-automerger@android.com> Tue Mar 25 14:34:59 2014 +0000
tree 8c799832db933bbd7dacf38798ce3152415b7044
parent b7f61da71b8ce161b275bf4c2a6ff771ad63848d
parent 5dba48f2c8e6ef39562f91b0c98ea9b845144590

am 5dba48f2: DO NOT MERGE Fix NPE during activity recreation

* commit '5dba48f2c8e6ef39562f91b0c98ea9b845144590':
  DO NOT MERGE Fix NPE during activity recreation

src/com/android/dialer/DialtactsActivity.java

diff --git a/src/com/android/dialer/DialtactsActivity.java b/src/com/android/dialer/DialtactsActivity.java
index ade5199..b78a7bc 100644
--- a/src/com/android/dialer/DialtactsActivity.java
+++ b/src/com/android/dialer/DialtactsActivity.java
@@ -1008,7 +1008,9 @@
 
     @Override
     public void setDialButtonEnabled(boolean enabled) {
-        mDialButton.setEnabled(enabled);
+        if (mDialButton != null) {
+            mDialButton.setEnabled(enabled);
+        }
     }
 
     @Override

src/com/android/dialer/dialpad/DialpadFragment.java

diff --git a/src/com/android/dialer/dialpad/DialpadFragment.java b/src/com/android/dialer/dialpad/DialpadFragment.java
index d25ffef..83cfbd8 100644
--- a/src/com/android/dialer/dialpad/DialpadFragment.java
+++ b/src/com/android/dialer/dialpad/DialpadFragment.java
@@ -1563,6 +1563,9 @@
      * Update the enabledness of the "Dial" and "Backspace" buttons if applicable.
      */
     private void updateDialAndDeleteButtonEnabledState() {
+        if (getActivity() == null) {
+            return;
+        }
         final boolean digitsNotEmpty = !isDigitsEmpty();
         mDelete.setEnabled(digitsNotEmpty);
         // On CDMA phones, if we're already on a call, we *always* enable the Dial button (since