From f98f7b969b55fe517eda9cebcd645309badccae8 Mon Sep 17 00:00:00 2001 From: Andrew Lee Date: Mon, 2 Feb 2015 15:50:29 -0800 Subject: Null-protect attempt to get EmergencyButton. Not all device layouts, such as for tablets, will have an Emergency Button, so check for null before attempting to set a callback. Bug: 18977746 Change-Id: I0e909e71c51f6923edda4707bb25053a5f2de398 --- .../Keyguard/src/com/android/keyguard/KeyguardAbsKeyInputView.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'packages/Keyguard/src/com/android/keyguard/KeyguardAbsKeyInputView.java') diff --git a/packages/Keyguard/src/com/android/keyguard/KeyguardAbsKeyInputView.java b/packages/Keyguard/src/com/android/keyguard/KeyguardAbsKeyInputView.java index 6f322b6..b2e4728 100644 --- a/packages/Keyguard/src/com/android/keyguard/KeyguardAbsKeyInputView.java +++ b/packages/Keyguard/src/com/android/keyguard/KeyguardAbsKeyInputView.java @@ -87,7 +87,9 @@ public abstract class KeyguardAbsKeyInputView extends LinearLayout mEcaView = findViewById(R.id.keyguard_selector_fade_container); EmergencyButton button = (EmergencyButton) findViewById(R.id.emergency_call_button); - button.setCallback(this); + if (button != null) { + button.setCallback(this); + } } public void onEmergencyButtonClickedWhenInCall() { -- cgit v1.1