diff options
author | Treehugger Robot <treehugger-gerrit@google.com> | 2017-09-28 20:59:07 +0000 |
---|---|---|
committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2017-09-28 20:59:07 +0000 |
commit | ea2f430dd5f5f5f08bb5c9438696112f44423abe (patch) | |
tree | eb2b91eaa8fafe6041c27dae82a68888ba771a93 /java/com/android/incallui/incall/impl/InCallFragment.java | |
parent | 126469d1020dbcb88146d595414faf9a0c4a1a28 (diff) | |
parent | 96aea2a8f42bfc55dd2b08c51698efb0d0559109 (diff) |
Merge changes I0ff396b5,I3b668c3a,Iab630f19,I6ef204ac
* changes:
Use goAsync() and dialer executor to insert post call notifications
Add the assisted dialing logic module.
Refactor DialerStrictMode into an interface.
Adding logging for transcription polling requests
Diffstat (limited to 'java/com/android/incallui/incall/impl/InCallFragment.java')
-rw-r--r-- | java/com/android/incallui/incall/impl/InCallFragment.java | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/java/com/android/incallui/incall/impl/InCallFragment.java b/java/com/android/incallui/incall/impl/InCallFragment.java index d91b5f275..13175656d 100644 --- a/java/com/android/incallui/incall/impl/InCallFragment.java +++ b/java/com/android/incallui/incall/impl/InCallFragment.java @@ -44,7 +44,7 @@ import com.android.dialer.common.LogUtil; import com.android.dialer.logging.DialerImpression; import com.android.dialer.logging.Logger; import com.android.dialer.multimedia.MultimediaData; -import com.android.dialer.strictmode.DialerStrictMode; +import com.android.dialer.strictmode.StrictModeUtils; import com.android.dialer.widget.LockableViewPager; import com.android.incallui.audioroute.AudioRouteSelectorDialogFragment; import com.android.incallui.audioroute.AudioRouteSelectorDialogFragment.AudioRouteSelectorPresenter; @@ -142,7 +142,7 @@ public class InCallFragment extends Fragment LogUtil.i("InCallFragment.onCreateView", null); // Bypass to avoid StrictModeResourceMismatchViolation final View view = - DialerStrictMode.bypass( + StrictModeUtils.bypass( () -> layoutInflater.inflate(R.layout.frag_incall_voice, viewGroup, false)); contactGridManager = new ContactGridManager( |