diff options
| author | Jay Shrauner <shrauner@google.com> | 2014-09-03 16:40:35 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-09-03 16:40:35 +0000 |
| commit | 9dcc84d8916fb3960f261015169984dad4ff7823 (patch) | |
| tree | 29406c2c58bdaca37ae0f421ca82ebe31b9f708c | |
| parent | b5431cc379077a8df2b23a3ba15a9c6e233b0c00 (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; |