diff options
author | Gilles Debunne <debunne@google.com> | 2010-02-24 15:50:40 -0800 |
---|---|---|
committer | Gilles Debunne <debunne@google.com> | 2010-02-25 13:46:50 -0800 |
commit | 192ab903887bbb8e7c7b6da5c581573850e30f46 (patch) | |
tree | 0c04c40ae694e8fd47bfc5f90f5de98ece14c3ca /core/java | |
parent | 27eb24148a935d10c2c490205174c59a47e76dc6 (diff) | |
download | frameworks_base-192ab903887bbb8e7c7b6da5c581573850e30f46.zip frameworks_base-192ab903887bbb8e7c7b6da5c581573850e30f46.tar.gz frameworks_base-192ab903887bbb8e7c7b6da5c581573850e30f46.tar.bz2 |
New test on ContextMenuInfo packed positions.
With and without headers.
Non regression test for bug
http://b/issue?id=1778239
Change-Id: I0235528ac6f8394292bac35f2350f3d5be1e4df7
Diffstat (limited to 'core/java')
-rw-r--r-- | core/java/android/test/InstrumentationTestCase.java | 8 | ||||
-rw-r--r-- | core/java/android/widget/ExpandableListConnector.java | 3 |
2 files changed, 5 insertions, 6 deletions
diff --git a/core/java/android/test/InstrumentationTestCase.java b/core/java/android/test/InstrumentationTestCase.java index 22d95d1..cd33d8a 100644 --- a/core/java/android/test/InstrumentationTestCase.java +++ b/core/java/android/test/InstrumentationTestCase.java @@ -16,8 +16,6 @@ package android.test; -import junit.framework.TestCase; - import android.app.Activity; import android.app.Instrumentation; import android.content.Intent; @@ -26,9 +24,11 @@ import android.util.Log; import android.view.KeyEvent; import java.lang.reflect.Field; +import java.lang.reflect.InvocationTargetException; import java.lang.reflect.Method; import java.lang.reflect.Modifier; -import java.lang.reflect.InvocationTargetException; + +import junit.framework.TestCase; /** * A test case that has access to {@link Instrumentation}. @@ -86,7 +86,6 @@ public class InstrumentationTestCase extends TestCase { * @param extras Optional extra stuff to pass to the activity. * @return The activity, or null if non launched. */ - @SuppressWarnings("unchecked") public final <T extends Activity> T launchActivity( String pkg, Class<T> activityCls, @@ -338,6 +337,7 @@ public class InstrumentationTestCase extends TestCase { * * @throws Exception */ + @Override protected void tearDown() throws Exception { Runtime.getRuntime().gc(); Runtime.getRuntime().runFinalization(); diff --git a/core/java/android/widget/ExpandableListConnector.java b/core/java/android/widget/ExpandableListConnector.java index ccce7c1..9c43e9b 100644 --- a/core/java/android/widget/ExpandableListConnector.java +++ b/core/java/android/widget/ExpandableListConnector.java @@ -25,7 +25,6 @@ import android.view.ViewGroup; import java.util.ArrayList; import java.util.Collections; -import java.util.List; /* * Implementation notes: @@ -637,7 +636,7 @@ class ExpandableListConnector extends BaseAdapter implements Filterable { // Check to see if it's already expanded if (posMetadata.groupMetadata != null) return false; - /* Restrict number of exp groups to mMaxExpGroupCount */ + /* Restrict number of expanded groups to mMaxExpGroupCount */ if (mExpGroupMetadataList.size() >= mMaxExpGroupCount) { /* Collapse a group */ // TODO: Collapse something not on the screen instead of the first one? |