Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 2c10d3a7 authored by Yorke Lee's avatar Yorke Lee Committed by Android Git Automerger
Browse files

am c52a78cb: am 5dba48f2: DO NOT MERGE Fix NPE during activity recreation 

* commit 'c52a78cb':
  DO NOT MERGE Fix NPE during activity recreation
parents 953d1d4b c52a78cb

src/com/android/dialer/DialtactsActivity.java

+3 −1
Original line number Diff line number Diff line
@@ -1008,8 +1008,10 @@ public class DialtactsActivity extends TransactionSafeActivity implements View.O 


    @Override

    public void setDialButtonEnabled(boolean enabled) {

        if (mDialButton != null) {

            mDialButton.setEnabled(enabled);

        }

    }



    @Override

    public void setDialButtonContainerVisible(boolean visible) {

src/com/android/dialer/dialpad/DialpadFragment.java

+3 −0
Original line number Diff line number Diff line
@@ -1563,6 +1563,9 @@ public class DialpadFragment extends Fragment 
     * 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