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:
32
tests/robotests/res/xml-mcc999/video_preference.xml
Normal file
32
tests/robotests/res/xml-mcc999/video_preference.xml
Normal file
@@ -0,0 +1,32 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<!--
|
||||
Copyright (C) 2019 The Android Open Source Project
|
||||
|
||||
Licensed under the Apache License, Version 2.0 (the "License");
|
||||
you may not use this file except in compliance with the License.
|
||||
You may obtain a copy of the License at
|
||||
|
||||
http://www.apache.org/licenses/LICENSE-2.0
|
||||
|
||||
Unless required by applicable law or agreed to in writing, software
|
||||
distributed under the License is distributed on an "AS IS" BASIS,
|
||||
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||
See the License for the specific language governing permissions and
|
||||
limitations under the License.
|
||||
-->
|
||||
|
||||
<PreferenceScreen
|
||||
xmlns:android="http://schemas.android.com/apk/res/android"
|
||||
xmlns:settings="http://schemas.android.com/apk/res-auto">
|
||||
<com.android.settings.widget.VideoPreference
|
||||
android:key="video1"
|
||||
settings:animation="@raw/adaptive_sleep"
|
||||
settings:preview="@drawable/adaptive_sleep"
|
||||
android:title="seek_bar_title"/>
|
||||
<com.android.settings.widget.VideoPreference
|
||||
android:key="video2"
|
||||
settings:animation="@raw/adaptive_sleep"
|
||||
settings:preview="@drawable/adaptive_sleep"
|
||||
settings:vectorAnimation="@drawable/adaptive_sleep"
|
||||
android:title="seek_bar_title"/>
|
||||
</PreferenceScreen >
|
||||
@@ -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);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user