commit 1dfa8ddc17a7f62f14d8435fd9712d1be0ebdf7e
author Yorke Lee <yorkelee@google.com> Tue Mar 25 00:11:31 2014 -0700
committer Yorke Lee <yorkelee@google.com> Tue Mar 25 00:11:31 2014 -0700
tree fb8418f9b5d2b6547013efebd7b292176abf496d
parent 6720273a04f940de2b383128b7596f33d781f231

Fix NPE during activity recreation

Bug: 13630676
Change-Id: I3b68d5f21a4b77eab5b5493dcde670ad08cdc372

src/com/android/dialer/DialtactsActivity.java

diff --git a/src/com/android/dialer/DialtactsActivity.java b/src/com/android/dialer/DialtactsActivity.java
index 363adda..32a22c9 100644
--- a/src/com/android/dialer/DialtactsActivity.java
+++ b/src/com/android/dialer/DialtactsActivity.java
@@ -970,7 +970,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 2d3c0ee..36d5cf8 100644
--- a/src/com/android/dialer/dialpad/DialpadFragment.java
+++ b/src/com/android/dialer/dialpad/DialpadFragment.java
@@ -1567,6 +1567,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