diff options
| -rw-r--r-- | packages/Keyguard/src/com/android/keyguard/KeyguardAbsKeyInputView.java | 4 | ||||
| -rw-r--r-- | packages/Keyguard/src/com/android/keyguard/KeyguardPatternView.java | 4 |
2 files changed, 6 insertions, 2 deletions
diff --git a/packages/Keyguard/src/com/android/keyguard/KeyguardAbsKeyInputView.java b/packages/Keyguard/src/com/android/keyguard/KeyguardAbsKeyInputView.java index 6f322b639f01..b2e47287d9b6 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() { diff --git a/packages/Keyguard/src/com/android/keyguard/KeyguardPatternView.java b/packages/Keyguard/src/com/android/keyguard/KeyguardPatternView.java index 053b3097e2cd..9aa572969978 100644 --- a/packages/Keyguard/src/com/android/keyguard/KeyguardPatternView.java +++ b/packages/Keyguard/src/com/android/keyguard/KeyguardPatternView.java @@ -143,7 +143,9 @@ public class KeyguardPatternView extends LinearLayout implements KeyguardSecurit mHelpMessage = (KeyguardMessageArea) findViewById(R.id.keyguard_message_area); EmergencyButton button = (EmergencyButton) findViewById(R.id.emergency_call_button); - button.setCallback(this); + if (button != null) { + button.setCallback(this); + } } public void onEmergencyButtonClickedWhenInCall() { |