From 3331545bd3fb769ae3f9246c0bd92fe35c6308ab Mon Sep 17 00:00:00 2001 From: sail Date: Thu, 29 Jun 2017 08:46:43 -0700 Subject: Automated g4 rollback of changelist 160202511. *** Reason for rollback *** Causes crash, see b/63127884 *** Original change description *** All Fragments are now support library Fragments. Switch a bunch of imports to support library Fragments (and Loaders) instead of framework Fragments (and Loaders). This was needed to use FragmentManager.isStateSaved() instead of manually tracking that state. This should reduce errors around committing after state is saved. Also adds METADATA presubmit to prevent new usages of framework Fragments or Loaders. *** Bug: 38241305,63127884 Test: N/A PiperOrigin-RevId: 160530287 Change-Id: Ie2c4d3561ebea2d0f05097ce89bdd9bc8767c8cf --- .../android/dialer/app/voicemail/VoicemailPlaybackPresenter.java | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) (limited to 'java/com/android/dialer/app/voicemail') diff --git a/java/com/android/dialer/app/voicemail/VoicemailPlaybackPresenter.java b/java/com/android/dialer/app/voicemail/VoicemailPlaybackPresenter.java index 856767c59..5c9bc01c2 100644 --- a/java/com/android/dialer/app/voicemail/VoicemailPlaybackPresenter.java +++ b/java/com/android/dialer/app/voicemail/VoicemailPlaybackPresenter.java @@ -37,7 +37,6 @@ import android.provider.VoicemailContract.Voicemails; import android.support.annotation.MainThread; import android.support.annotation.Nullable; import android.support.annotation.VisibleForTesting; -import android.support.v4.app.FragmentActivity; import android.support.v4.content.FileProvider; import android.text.TextUtils; import android.util.Pair; @@ -128,7 +127,7 @@ public class VoicemailPlaybackPresenter protected MediaPlayer mMediaPlayer; // Used to run async tasks that need to interact with the UI. protected AsyncTaskExecutor mAsyncTaskExecutor; - private FragmentActivity mActivity; + private Activity mActivity; private PlaybackView mView; private int mPosition; private boolean mIsPlaying; @@ -176,7 +175,7 @@ public class VoicemailPlaybackPresenter */ @MainThread public static VoicemailPlaybackPresenter getInstance( - FragmentActivity activity, Bundle savedInstanceState) { + Activity activity, Bundle savedInstanceState) { if (sInstance == null) { sInstance = new VoicemailPlaybackPresenter(activity); } @@ -194,7 +193,7 @@ public class VoicemailPlaybackPresenter /** Update variables which are activity-dependent or state-dependent. */ @MainThread - protected void init(FragmentActivity activity, Bundle savedInstanceState) { + protected void init(Activity activity, Bundle savedInstanceState) { Assert.isMainThread(); mActivity = activity; mContext = activity; @@ -221,7 +220,7 @@ public class VoicemailPlaybackPresenter } shareVoicemailExecutor = DialerExecutors.createUiTaskBuilder( - mActivity.getSupportFragmentManager(), "test", new ShareVoicemailWorker()) + mActivity.getFragmentManager(), "test", new ShareVoicemailWorker()) .onSuccess( output -> { if (output == null) { -- cgit v1.2.3