Fix Settings crashed on tapping on notification animation video

- When preference goes back from pause state, it doesn't call through
onBindViewHolder, caused surface view doesn't attach to Mediaplayer.
Call attachView in initAnimationController and set SurfaceView to
MediaPlayer when onSurfaceTextureUpdated to fix the issue.

Fixes: 143905693
Test: manual, robolectric
Change-Id: I0eceead2e4c90ca176ef0f35937898f9b9be6232
This commit is contained in:
Raff Tsai
2019-11-05 13:24:08 +08:00
parent ee9f1be50a
commit 9547fa73cc
4 changed files with 81 additions and 9 deletions

View File

@@ -27,11 +27,13 @@ import static org.mockito.Mockito.when;
import android.content.Context;
import android.graphics.SurfaceTexture;
import android.os.Bundle;
import android.view.LayoutInflater;
import android.view.TextureView;
import android.view.View;
import android.widget.ImageView;
import androidx.preference.PreferenceFragmentCompat;
import androidx.preference.PreferenceViewHolder;
import com.android.settings.R;
@@ -45,6 +47,7 @@ import org.mockito.MockitoAnnotations;
import org.robolectric.RobolectricTestRunner;
import org.robolectric.RuntimeEnvironment;
import org.robolectric.annotation.Config;
import org.robolectric.shadows.androidx.fragment.FragmentController;
@RunWith(RobolectricTestRunner.class)
@Config(shadows = ShadowSettingsMediaPlayer.class)
@@ -135,4 +138,29 @@ public class VideoPreferenceTest {
verify(fakePreview).setVisibility(eq(View.GONE));
assertThat(mAnimationController.isPlaying()).isTrue();
}
@Test
@Config(qualifiers = "mcc999")
public void onViewVisible_createAnimationController() {
final PreferenceFragmentCompat fragment = FragmentController.of(
new VideoPreferenceTest.TestFragment(),
new Bundle())
.create()
.start()
.resume()
.get();
final VideoPreference vp1 = fragment.findPreference("video1");
final VideoPreference vp2 = fragment.findPreference("video2");
assertThat(vp1.mAnimationController instanceof MediaAnimationController).isTrue();
assertThat(vp2.mAnimationController instanceof VectorAnimationController).isTrue();
}
public static class TestFragment extends PreferenceFragmentCompat {
@Override
public void onCreatePreferences(Bundle savedInstanceState, String rootKey) {
addPreferencesFromResource(R.xml.video_preference);
}
}
}