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

Commit 6e493c64 authored by Joseph Lehner's avatar Joseph Lehner
Browse files

Fix FC caused by NullPointerException 

Under certain circumstances, setupKeypad() was called from
updateDialer() *before* the keypad's Views were initialized,
causing the app to force-close.
This patch moves the null check from onCreate() to setupKeypad()
itself, so as to prevent a NullPointerException when called
from updateDialer().

Change-Id: Ide8998ccccb66415ea2d2f819cd542f48466fe09
parent acd13889

src/com/android/contacts/TwelveKeyDialer.java

+7 −6
Original line number Original line Diff line number Diff line
@@ -241,11 +241,7 @@ public class TwelveKeyDialer extends Activity implements View.OnClickListener, 




        maybeAddNumberFormatting();

        maybeAddNumberFormatting();





        // Check for the presence of the keypad

        View view = findViewById(R.id.one);

        if (view != null) {

        setupKeypad(true);

        setupKeypad(true);

        }





        mVoicemailDialAndDeleteRow = findViewById(R.id.voicemailAndDialAndDelete);

        mVoicemailDialAndDeleteRow = findViewById(R.id.voicemailAndDialAndDelete);
@@ -261,7 +257,7 @@ public class TwelveKeyDialer extends Activity implements View.OnClickListener, 
            mDialButton = null;

            mDialButton = null;

        }

        }





        view = mVoicemailDialAndDeleteRow.findViewById(R.id.deleteButton);

        View view = mVoicemailDialAndDeleteRow.findViewById(R.id.deleteButton);

        view.setOnClickListener(this);

        view.setOnClickListener(this);

        view.setOnLongClickListener(this);

        view.setOnLongClickListener(this);

        mDelete = view;

        mDelete = view;
@@ -414,6 +410,11 @@ public class TwelveKeyDialer extends Activity implements View.OnClickListener, 
        

        

        //YC: Changed type from View to ImageButton

        //YC: Changed type from View to ImageButton

        ImageButton digitOne = (ImageButton)findViewById(R.id.one);

        ImageButton digitOne = (ImageButton)findViewById(R.id.one);



        // Check for the presence of the keypad

        if (digitOne == null)

            return;



        digitOne.setOnClickListener(this);

        digitOne.setOnClickListener(this);

        digitOne.setOnLongClickListener(this);

        digitOne.setOnLongClickListener(this);