From 95b29a2a4ccf86cd4eae8e8d4ce835b5c43e0f91 Mon Sep 17 00:00:00 2001
From: Yorke Lee <yorkelee@google.com>
Date: Mon, 10 Mar 2014 16:06:00 -0700
Subject: 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
---
 InCallUI/src/com/android/incallui/DialpadFragment.java | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

(limited to 'InCallUI/src/com/android/incallui')

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()) {
-- 
cgit v1.2.3