diff options
| author | Narayan Kamath <narayan@google.com> | 2015-11-12 11:21:22 +0000 |
|---|---|---|
| committer | Narayan Kamath <narayan@google.com> | 2015-11-12 11:22:07 +0000 |
| commit | bf07204bff37fa34dbdb32e0a9d790d97ef46a81 (patch) | |
| tree | ae31b3d5e4b8c8fa1717a2828c969f9c7aef10d1 /json | |
| parent | b75ac5656e423b03e009f809d81dd04de2de6664 (diff) | |
| parent | 48c1f0e1f3ceb54f5d781f18fa4139b06e00dfde (diff) | |
Merge lmp changes into mnc.
Change-Id: I8f49c58f39dc5f4268c6b5718cab18ed26ac930a
Diffstat (limited to 'json')
| -rw-r--r-- | json/src/test/java/org/json/JSONObjectTest.java | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/json/src/test/java/org/json/JSONObjectTest.java b/json/src/test/java/org/json/JSONObjectTest.java index a1b7b136fc..9029ec6c6c 100644 --- a/json/src/test/java/org/json/JSONObjectTest.java +++ b/json/src/test/java/org/json/JSONObjectTest.java @@ -981,7 +981,6 @@ public class JSONObjectTest extends TestCase { assertTrue(JSONObject.wrap(new HashMap<String, String>()) instanceof JSONObject); assertTrue(JSONObject.wrap(Double.valueOf(0)) instanceof Double); assertTrue(JSONObject.wrap("hello") instanceof String); - assertTrue(JSONObject.wrap(java.nio.channels.Selector.open()) instanceof String); } // https://code.google.com/p/android/issues/detail?id=55114 |