Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix bug 1927213 test failures.

Browse Source 
Eat the security exception that is now thrown by the window manager to
retain the old behavior for tests.  (We still need to throw the
exception from the WM for the new permission tests.)
This commit is contained in:
Dianne Hackborn
2009-06-18 18:36:37 -07:00
parent e748161ca8
commit d7ed9175aa
1 changed files with 21 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
core/java/android/test/InstrumentationTestCase.java
View File

@@ -241,7 +241,13 @@ public class InstrumentationTestCase extends TestCase {
try {
final Field keyCodeField = KeyEvent.class.getField("KEYCODE_" + key);
final int keyCode = keyCodeField.getInt(null);
instrumentation.sendKeyDownUpSync(keyCode);
try {
instrumentation.sendKeyDownUpSync(keyCode);
} catch (SecurityException e) {
// Ignore security exceptions that are now thrown
// when trying to send to another app, to retain
// compatibility with existing tests.
}
} catch (NoSuchFieldException e) {
Log.w("ActivityTestCase", "Unknown keycode: KEYCODE_" + key);
break;
@@ -266,7 +272,13 @@ public class InstrumentationTestCase extends TestCase {
final Instrumentation instrumentation = getInstrumentation();
for (int i = 0; i < count; i++) {
instrumentation.sendKeyDownUpSync(keys[i]);
try {
instrumentation.sendKeyDownUpSync(keys[i]);
} catch (SecurityException e) {
// Ignore security exceptions that are now thrown
// when trying to send to another app, to retain
// compatibility with existing tests.
}
}
instrumentation.waitForIdleSync();
@@ -292,7 +304,13 @@ public class InstrumentationTestCase extends TestCase {
final int keyCount = keys[i];
final int keyCode = keys[i + 1];
for (int j = 0; j < keyCount; j++) {
instrumentation.sendKeyDownUpSync(keyCode);
try {
instrumentation.sendKeyDownUpSync(keyCode);
} catch (SecurityException e) {
// Ignore security exceptions that are now thrown
// when trying to send to another app, to retain
// compatibility with existing tests.
}
}
}