Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Added null test to avoid regression for onRemoteVolumeChanged." into oc-dr1-dev am: 6407874ae0

Browse Source 
am: 7084e59bae

Change-Id: If30fd4e2ed88472b56e56dadbddb9cb46d0a7680
This commit is contained in:
Beverly
2017-08-02 18:49:46 +00:00
committed by android-build-merger
parent e3a067850e 7084e59bae
commit 1fcc58f4ea
2 changed files with 15 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
packages/SystemUI/src/com/android/systemui/volume/VolumeDialogControllerImpl.java
View File

@@ -100,7 +100,7 @@ public class VolumeDialogControllerImpl implements VolumeDialogController, Dumpa
private final MediaSessions mMediaSessions; private final MediaSessions mMediaSessions;
protected C mCallbacks = new C(); protected C mCallbacks = new C();
private final State mState = new State(); private final State mState = new State();
private final MediaSessionsCallbacks mMediaSessionsCallbacksW = new MediaSessionsCallbacks(); protected final MediaSessionsCallbacks mMediaSessionsCallbacksW = new MediaSessionsCallbacks();
private final Vibrator mVibrator; private final Vibrator mVibrator;
private final boolean mHasVibrator; private final boolean mHasVibrator;
private boolean mShowA11yStream; private boolean mShowA11yStream;
@@ -906,7 +906,7 @@ public class VolumeDialogControllerImpl implements VolumeDialogController, Dumpa
} }
} }
private final class MediaSessionsCallbacks implements MediaSessions.Callbacks { protected final class MediaSessionsCallbacks implements MediaSessions.Callbacks {
private final HashMap<Token, Integer> mRemoteStreams = new HashMap<>(); private final HashMap<Token, Integer> mRemoteStreams = new HashMap<>();
private int mNextStream = DYNAMIC_STREAM_START_INDEX; private int mNextStream = DYNAMIC_STREAM_START_INDEX;

13
packages/SystemUI/tests/src/com/android/systemui/volume/VolumeDialogControllerImplTest.java
View File

@@ -24,6 +24,7 @@ import static org.mockito.Mockito.when;
import android.content.Context; import android.content.Context;
import android.media.AudioManager; import android.media.AudioManager;
import android.media.session.MediaSession;
import android.support.test.filters.SmallTest; import android.support.test.filters.SmallTest;
import com.android.systemui.SysuiTestCase; import com.android.systemui.SysuiTestCase;
import com.android.systemui.keyguard.WakefulnessLifecycle; import com.android.systemui.keyguard.WakefulnessLifecycle;
@@ -73,6 +74,18 @@ public class VolumeDialogControllerImplTest extends SysuiTestCase {
verify(mCallback, times(1)).onShowRequested(Events.SHOW_REASON_VOLUME_CHANGED); verify(mCallback, times(1)).onShowRequested(Events.SHOW_REASON_VOLUME_CHANGED);
} }
@Test
public void testOnRemoteVolumeChanged_newStream_noNullPointer() {
MediaSession.Token token = new MediaSession.Token(null);
mVolumeController.mMediaSessionsCallbacksW.onRemoteVolumeChanged(token, 0);
}
@Test
public void testOnRemoteRemove_newStream_noNullPointer() {
MediaSession.Token token = new MediaSession.Token(null);
mVolumeController.mMediaSessionsCallbacksW.onRemoteRemoved(token);
}
static class TestableVolumeDialogControllerImpl extends VolumeDialogControllerImpl { static class TestableVolumeDialogControllerImpl extends VolumeDialogControllerImpl {
public TestableVolumeDialogControllerImpl(Context context, C callback, StatusBar s) { public TestableVolumeDialogControllerImpl(Context context, C callback, StatusBar s) {
super(context); super(context);