summaryrefslogtreecommitdiff
path: root/InCallUI
diff options
context:
space:
mode:
authorNancy Chen <nancychen@google.com>2015-11-23 21:55:26 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2015-11-23 21:55:26 +0000
commit8e09cfcc2ab50e48bc2747205c8e2e7743b4f4b7 (patch)
tree5c8c54597641720c8037f522c8f8f1ac607717f6 /InCallUI
parent4dc7aa24d332e59c418a6c3e19e254a9eb0c2f41 (diff)
parent3cb6e8d5a396ed8190cdb82b3e8e7b25c8084698 (diff)
Merge "Use getActivity instead of getContext for backporting." into ub-contactsdialer-b-dev
Diffstat (limited to 'InCallUI')
-rw-r--r--InCallUI/src/com/android/incallui/CallCardFragment.java5
1 files changed, 5 insertions, 0 deletions
diff --git a/InCallUI/src/com/android/incallui/CallCardFragment.java b/InCallUI/src/com/android/incallui/CallCardFragment.java
index 1564d60ad..3c92a768d 100644
--- a/InCallUI/src/com/android/incallui/CallCardFragment.java
+++ b/InCallUI/src/com/android/incallui/CallCardFragment.java
@@ -1260,6 +1260,11 @@ public class CallCardFragment extends BaseFragment<CallCardPresenter, CallCardPr
}
@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