Merge "Added null test to avoid regression for onRemoteVolumeChanged." into oc-dr1-dev (7084e59b) · Commits · e / os / android_frameworks_base

packages/SystemUI/src/com/android/systemui/volume/VolumeDialogControllerImpl.java

+2 −2

Original line number	Diff line number	Diff line
		@@ -100,7 +100,7 @@ public class VolumeDialogControllerImpl implements VolumeDialogController, Dumpa
		private final MediaSessions mMediaSessions;
		protected C mCallbacks = new C();
		private final State mState = new State();
		private final MediaSessionsCallbacks mMediaSessionsCallbacksW = new MediaSessionsCallbacks();
		protected final MediaSessionsCallbacks mMediaSessionsCallbacksW = new MediaSessionsCallbacks();
		private final Vibrator mVibrator;
		private final boolean mHasVibrator;
		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 int mNextStream = DYNAMIC_STREAM_START_INDEX;

+13 −0

Original line number	Diff line number	Diff line
		@@ -24,6 +24,7 @@ import static org.mockito.Mockito.when;

		import android.content.Context;
		import android.media.AudioManager;
		import android.media.session.MediaSession;
		import android.support.test.filters.SmallTest;
		import com.android.systemui.SysuiTestCase;
		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);
		}

		@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 {
		public TestableVolumeDialogControllerImpl(Context context, C callback, StatusBar s) {
		super(context);