diff options
| author | Eric Erfanian <erfanian@google.com> | 2017-04-06 23:16:42 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2017-04-06 23:16:42 +0000 |
| commit | 28188020060d1ad3304dfa0367486ff5bb35da62 (patch) | |
| tree | 8d08d4f2292aa84dc435d455891e7ab633d95a25 /java/com/android/incallui/incall/impl/InCallFragment.java | |
| parent | 34e183cfd77f68e0ade42d2080c76f54a319430d (diff) | |
| parent | 01a86435499d66b267765f89b7dd9c83c158ddfe (diff) | |
Update AOSP Dialer source from internal google3 repository at cl/152373142. am: d8046e520a
am: 01a8643549
Change-Id: Ib92542e6b88bc8d8906982280244661ed7dbca8f
Diffstat (limited to 'java/com/android/incallui/incall/impl/InCallFragment.java')
| -rw-r--r-- | java/com/android/incallui/incall/impl/InCallFragment.java | 12 |
1 files changed, 10 insertions, 2 deletions
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 @@ -202,6 +202,12 @@ public class InCallFragment extends Fragment } @Override + public void onPause() { + super.onPause(); + inCallScreenDelegate.onInCallScreenPaused(); + } + + @Override public void onDestroy() { super.onDestroy(); inCallScreenDelegate.onInCallScreenUnready(); @@ -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()); + } } } |