diff options
| author | Jay Shrauner <shrauner@google.com> | 2014-09-02 22:29:51 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-09-02 22:29:51 +0000 |
| commit | 880f1e8eeb2baf0c1105c2c168fe62499e0bfc7f (patch) | |
| tree | c1ebd9c0017dcee38beb939a537da4d605f7099d | |
| parent | bd5a05797d8ea55a6867288be5b530c0decf409b (diff) | |
| parent | 4e077af2b9a50a72f4268a795bc744cd4aae5e54 (diff) | |
am 4e077af2: Fix NPE when activity is null
* commit '4e077af2b9a50a72f4268a795bc744cd4aae5e54':
Fix NPE when activity is null
| -rw-r--r-- | src/com/android/dialer/dialpad/DialpadFragment.java | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/src/com/android/dialer/dialpad/DialpadFragment.java b/src/com/android/dialer/dialpad/DialpadFragment.java index 141a45188..909679191 100644 --- a/src/com/android/dialer/dialpad/DialpadFragment.java +++ b/src/com/android/dialer/dialpad/DialpadFragment.java @@ -1204,6 +1204,9 @@ public class DialpadFragment extends AnalyticsFragment * 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; |