summaryrefslogtreecommitdiff
path: root/InCallUI/src/com/android/incallui
diff options
context:
space:
mode:
authorYorke Lee <yorkelee@google.com>2014-03-10 16:06:00 -0700
committerYorke Lee <yorkelee@google.com>2014-03-10 16:06:00 -0700
commit95b29a2a4ccf86cd4eae8e8d4ce835b5c43e0f91 (patch)
tree00106773a76561edd871a564364bd9a660e25db6 /InCallUI/src/com/android/incallui
parent900988c67aa4276f6e2675e05d35db88f78c70aa (diff)
Fix NPE in DialpadFragment.onHover when fragment is detached
Use the view's context(which should never be null) instead of getActivity() to get an instance of AccessibilityManager. Bug: 13400751 Change-Id: Ib93e16e82b8eea4683ff09aaef81ee66f15f903c
Diffstat (limited to 'InCallUI/src/com/android/incallui')
-rw-r--r--InCallUI/src/com/android/incallui/DialpadFragment.java5
1 files changed, 2 insertions, 3 deletions
diff --git a/InCallUI/src/com/android/incallui/DialpadFragment.java b/InCallUI/src/com/android/incallui/DialpadFragment.java
index c6ec742af..e9cabd2c4 100644
--- a/InCallUI/src/com/android/incallui/DialpadFragment.java
+++ b/InCallUI/src/com/android/incallui/DialpadFragment.java
@@ -333,9 +333,8 @@ public class DialpadFragment extends BaseFragment<DialpadPresenter, DialpadPrese
@Override
public void onClick(View v) {
- Log.d(this, "onClick");
final AccessibilityManager accessibilityManager = (AccessibilityManager)
- getActivity().getSystemService(Context.ACCESSIBILITY_SERVICE);
+ v.getContext().getSystemService(Context.ACCESSIBILITY_SERVICE);
// When accessibility is on, simulate press and release to preserve the
// semantic meaning of performClick(). Required for Braille support.
if (accessibilityManager.isEnabled()) {
@@ -352,7 +351,7 @@ public class DialpadFragment extends BaseFragment<DialpadPresenter, DialpadPrese
// When touch exploration is turned on, lifting a finger while inside
// the button's hover target bounds should perform a click action.
final AccessibilityManager accessibilityManager = (AccessibilityManager)
- getActivity().getSystemService(Context.ACCESSIBILITY_SERVICE);
+ v.getContext().getSystemService(Context.ACCESSIBILITY_SERVICE);
if (accessibilityManager.isEnabled()
&& accessibilityManager.isTouchExplorationEnabled()) {