commit 6f72219fd7af6a28e3df775cb6547784d96a264d
author Jay Shrauner <shrauner@google.com> Wed Sep 03 05:48:59 2014 +0000
committer Android Git Automerger <android-git-automerger@android.com> Wed Sep 03 05:48:59 2014 +0000
tree c1ebd9c0017dcee38beb939a537da4d605f7099d
parent 68fd5f60e55401e57aa7be45e79cd5f850983906
parent 880f1e8eeb2baf0c1105c2c168fe62499e0bfc7f

am 880f1e8e: am 4e077af2: Fix NPE when activity is null

* commit '880f1e8eeb2baf0c1105c2c168fe62499e0bfc7f':
  Fix NPE when activity is null

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 141a451..9096791 100644
--- a/src/com/android/dialer/dialpad/DialpadFragment.java
+++ b/src/com/android/dialer/dialpad/DialpadFragment.java
@@ -1204,6 +1204,9 @@
      *                of the regular Dialer UI
      */
     private void showDialpadChooser(boolean enabled) {
+        if (getActivity() == null) {
+            return;
+        }
         // Check if onCreateView() is already called by checking one of View objects.
         if (!isLayoutReady()) {
             return;