Merge "Debug: Add test for bug 31943543" am: 7c4efe421c am: afe73c0c3c am: 28369279fe

am: e5ce80d0fe

Change-Id: Ie23c3bbe1de5dd1b7edfd1e1351ccab38c02c4ec

core/tests/coretests/src/com/android/internal/os/DebugTest.java

@@ -64,4 +64,12 @@ public class DebugTest extends TestCase {
     public void testGetCallers() {
         assertTrue(callDepth1().matches(EXPECTED_GET_CALLERS));
     }
+
+    /**
+     * Regression test for b/31943543. Note: must be run under CheckJNI to detect the issue.
+     */
+    public void testGetMemoryInfo() {
+        Debug.MemoryInfo info = new Debug.MemoryInfo();
+        Debug.getMemoryInfo(-1, info);
+    }
 }