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

Commit ffbace6f authored by Andrew Lee's avatar Andrew Lee Committed by Android (Google) Code Review
Browse files

Merge "Null-protect attempt to get EmergencyButton."

parents 9dfd7bd5 f98f7b96

packages/Keyguard/src/com/android/keyguard/KeyguardAbsKeyInputView.java

+3 −1
Original line number Diff line number Diff line
@@ -87,8 +87,10 @@ public abstract class KeyguardAbsKeyInputView extends LinearLayout 
        mEcaView = findViewById(R.id.keyguard_selector_fade_container);



        EmergencyButton button = (EmergencyButton) findViewById(R.id.emergency_call_button);

        if (button != null) {

            button.setCallback(this);

        }

    }



    public void onEmergencyButtonClickedWhenInCall() {

        mCallback.reset();

packages/Keyguard/src/com/android/keyguard/KeyguardPatternView.java

+3 −1
Original line number Diff line number Diff line
@@ -143,8 +143,10 @@ public class KeyguardPatternView extends LinearLayout implements KeyguardSecurit 
        mHelpMessage = (KeyguardMessageArea) findViewById(R.id.keyguard_message_area);



        EmergencyButton button = (EmergencyButton) findViewById(R.id.emergency_call_button);

        if (button != null) {

            button.setCallback(this);

        }

    }



    public void onEmergencyButtonClickedWhenInCall() {

        mCallback.reset();