From d8046e520a866b9948ee9ba47cf642b441ca8e23 Mon Sep 17 00:00:00 2001 From: Eric Erfanian Date: Thu, 6 Apr 2017 09:41:50 -0700 Subject: Update AOSP Dialer source from internal google3 repository at cl/152373142. Test: make, treehugger This CL updates the AOSP Dialer source with all the changes that have gone into the private google3 repository. This includes all the changes from cl/151342913 (3/27/2017) to cl/152373142 (4/06/2017). This goal of these drops is to keep the AOSP source in sync with the internal google3 repository. Currently these sync are done by hand with very minor modifications to the internal source code. See the Android.mk file for list of modifications. Our current goal is to do frequent drops (daily if possible) and eventually switched to an automated process. Change-Id: I2fbc88cf6867b90ac8b65f75e5e34468988c7217 --- java/com/android/incallui/incall/impl/InCallFragment.java | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) (limited to 'java/com/android/incallui/incall/impl/InCallFragment.java') diff --git a/java/com/android/incallui/incall/impl/InCallFragment.java b/java/com/android/incallui/incall/impl/InCallFragment.java index ea3ce8efb..b02237dcf 100644 --- a/java/com/android/incallui/incall/impl/InCallFragment.java +++ b/java/com/android/incallui/incall/impl/InCallFragment.java @@ -201,6 +201,12 @@ public class InCallFragment extends Fragment inCallScreenDelegate.onInCallScreenReady(); } + @Override + public void onPause() { + super.onPause(); + inCallScreenDelegate.onInCallScreenPaused(); + } + @Override public void onDestroy() { super.onDestroy(); @@ -438,8 +444,10 @@ public class InCallFragment extends Fragment pager.setSwipingLocked(false); } else { paginator.setVisibility(View.GONE); - pager.setSwipingLocked(true); - pager.setCurrentItem(adapter.getButtonGridPosition()); + if (adapter != null) { + pager.setSwipingLocked(true); + pager.setCurrentItem(adapter.getButtonGridPosition()); + } } } -- cgit v1.2.3