diff options
| author | Richard MacGregor <rmacgregor@cyngn.com> | 2016-02-24 16:30:37 -0800 |
|---|---|---|
| committer | Stephen Bird <sbird@cyngn.com> | 2016-04-08 10:21:10 -0700 |
| commit | cd9060ad0d764f909f2141895022f9d778ea3ea6 (patch) | |
| tree | af6617b42ac5c9b10ee112ea0c93cf3ef397a73d | |
| parent | a0cae1a9ba41e371c135124b4c84ea16ae6c18a1 (diff) | |
| download | android_packages_apps_Dialer-cd9060ad0d764f909f2141895022f9d778ea3ea6.tar.gz android_packages_apps_Dialer-cd9060ad0d764f909f2141895022f9d778ea3ea6.tar.bz2 android_packages_apps_Dialer-cd9060ad0d764f909f2141895022f9d778ea3ea6.zip | |
Fix NPE rotation issue
Show overflow button logic relies on something that may not exist
initially.
Change-Id: I2917b12bdf474b021cac28dc363fb24bd8af488f
| -rw-r--r-- | src/com/android/dialer/dialpad/DialpadFragment.java | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/src/com/android/dialer/dialpad/DialpadFragment.java b/src/com/android/dialer/dialpad/DialpadFragment.java index 5d44e8495..aa48ac0ba 100644 --- a/src/com/android/dialer/dialpad/DialpadFragment.java +++ b/src/com/android/dialer/dialpad/DialpadFragment.java @@ -468,7 +468,8 @@ public class DialpadFragment extends Fragment CreditBarHelper.clearCallRateInformation(mDialpadView.getRateContainer(), cbvl); } mOverflowMenuButton.setVisibility(isDigitsEmpty() || - mCurrentCallMethodInfo.mIsInCallProvider ? View.INVISIBLE : View.VISIBLE); + (mCurrentCallMethodInfo != null && mCurrentCallMethodInfo.mIsInCallProvider) ? + View.INVISIBLE : View.VISIBLE); } public void setCurrentCallMethod(CallMethodInfo callMethodInfo) { @@ -764,7 +765,8 @@ public class DialpadFragment extends Fragment mOverflowMenuButton.setOnTouchListener(mOverflowPopupMenu.getDragToOpenListener()); mOverflowMenuButton.setOnClickListener(this); mOverflowMenuButton.setVisibility(isDigitsEmpty() || - mCurrentCallMethodInfo.mIsInCallProvider ? View.INVISIBLE : View.VISIBLE); + (mCurrentCallMethodInfo != null && mCurrentCallMethodInfo.mIsInCallProvider) ? + View.INVISIBLE : View.VISIBLE); if (mFirstLaunch) { // The onHiddenChanged callback does not get called the first time the fragment is |