commit 8e09cfcc2ab50e48bc2747205c8e2e7743b4f4b7
author Nancy Chen <nancychen@google.com> Mon Nov 23 21:55:26 2015 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Mon Nov 23 21:55:26 2015 +0000
tree 5c8c54597641720c8037f522c8f8f1ac607717f6
parent 4dc7aa24d332e59c418a6c3e19e254a9eb0c2f41
parent 3cb6e8d5a396ed8190cdb82b3e8e7b25c8084698

Merge "Use getActivity instead of getContext for backporting." into ub-contactsdialer-b-dev

InCallUI/src/com/android/incallui/CallCardFragment.java

diff --git a/InCallUI/src/com/android/incallui/CallCardFragment.java b/InCallUI/src/com/android/incallui/CallCardFragment.java
index 1564d60..3c92a76 100644
--- a/InCallUI/src/com/android/incallui/CallCardFragment.java
+++ b/InCallUI/src/com/android/incallui/CallCardFragment.java
@@ -1260,6 +1260,11 @@
     }
 
     @Override
+    public Context getContext() {
+        return getActivity();
+    }
+
+    @Override
     public void onResume() {
         super.onResume();
         // If the previous launch animation is still running, cancel it so that we don't get