commit b6ab3b21fce45f10fc939976f1bf409f63b7fe13
author Phil Burk <philburk@google.com> Mon Aug 10 10:30:17 2015 -0700
committer The Android Automerger <android-build@android.com> Mon Aug 10 13:54:28 2015 -0700
tree 445423a5fae94d195929cbb7c66c69b43f646a06
parent 861fc41d4b41f22ffb6fc3343b23678cf5b9b5a7

MIDI CTS: remove tests that pass null callback

We switched from using a HashMap to a ConcurrentHashMap in the MidiManager.
The ConcurrentHashMap does not tolerate null keys.
Passing a null key is not a required part of the API.
So rather than modify the framework code, we just removed the tests
that passed a null key.

Bug: 23033283
Change-Id: I3ed96d9ce3f42187efd9b1f4d2f624e37acd71cd
Signed-off-by: Phil Burk <philburk@google.com>

tests/tests/media/src/android/media/cts/MidiSoloTest.java

diff --git a/tests/tests/media/src/android/media/cts/MidiSoloTest.java b/tests/tests/media/src/android/media/cts/MidiSoloTest.java
index 4c1a5e8..d198ee8 100644
--- a/tests/tests/media/src/android/media/cts/MidiSoloTest.java
+++ b/tests/tests/media/src/android/media/cts/MidiSoloTest.java
@@ -97,9 +97,7 @@
         MidiManager.DeviceCallback callback = new MidiManager.DeviceCallback();
 
         // These should not crash.
-        midiManager.unregisterDeviceCallback(null);
         midiManager.unregisterDeviceCallback(callback);
-        midiManager.registerDeviceCallback(null, null);
         midiManager.registerDeviceCallback(callback, null);
         midiManager.unregisterDeviceCallback(callback);
         midiManager.registerDeviceCallback(callback, new Handler(Looper.getMainLooper()));
@@ -107,9 +105,6 @@
         midiManager.unregisterDeviceCallback(callback);
         midiManager.unregisterDeviceCallback(callback);
         midiManager.unregisterDeviceCallback(callback);
-        midiManager.registerDeviceCallback(null, new Handler(Looper.getMainLooper()));
-        midiManager.unregisterDeviceCallback(callback);
-        midiManager.unregisterDeviceCallback(null);
     }
 
     public void testMidiReceiver() throws Exception {