Merge "Big restructuring of this code to make it more readable and better modularized. Also switches to a simpler model: instead of a pong game, now the host Android device initializes the microcontroller with an initial state, and then calls on the microcontroller for updates. The microcontroller is just used as a model/state engine for what the app will render. Barring bugs, this microcontroller-side code should now be done." into gingerbread
diff --git a/tests/tests/permission/src/android/permission/cts/NoActivityRelatedPermissionTest.java b/tests/tests/permission/src/android/permission/cts/NoActivityRelatedPermissionTest.java
index 2d11883..a645424 100644
--- a/tests/tests/permission/src/android/permission/cts/NoActivityRelatedPermissionTest.java
+++ b/tests/tests/permission/src/android/permission/cts/NoActivityRelatedPermissionTest.java
@@ -22,7 +22,6 @@
import android.app.ActivityManager;
import android.content.Context;
import android.test.ActivityInstrumentationTestCase2;
-import android.test.UiThreadTest;
import android.test.suitebuilder.annotation.MediumTest;
/**
@@ -45,22 +44,6 @@
}
/**
- * Verify that setting Activity's persistent attribute requires permissions.
- * <p>Requires Permission:
- * {@link android.Manifest.permission#PERSISTENT_ACTIVITY}.
- */
- @UiThreadTest
- @MediumTest
- public void testSetPersistent() {
- try {
- mActivity.setPersistent(true);
- fail("Activity.setPersistent() did not throw SecurityException as expected");
- } catch (SecurityException e) {
- // Expected
- }
- }
-
- /**
* Verify that get task requires permissions.
* <p>Requires Permission:
* {@link android.Manifest.permission#GET_TASKS}
diff --git a/tests/tests/text/src/android/text/method/cts/NumberKeyListenerTest.java b/tests/tests/text/src/android/text/method/cts/NumberKeyListenerTest.java
index bf1b6fb..5c0b9f1 100644
--- a/tests/tests/text/src/android/text/method/cts/NumberKeyListenerTest.java
+++ b/tests/tests/text/src/android/text/method/cts/NumberKeyListenerTest.java
@@ -128,8 +128,8 @@
SpannableString str = new SpannableString("012345");
assertEquals('0', mNumberKeyListener.lookup(event1, str));
- KeyEvent event2 = new KeyEvent(KeyEvent.ACTION_DOWN, KeyEvent.KEYCODE_X);
- str = new SpannableString("XYZW");
+ KeyEvent event2 = new KeyEvent(KeyEvent.ACTION_DOWN, KeyEvent.KEYCODE_A);
+ str = new SpannableString("ABCD");
assertEquals('\0', mNumberKeyListener.lookup(event2, str));
try {