summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSvetoslav Ganov <svetoslavganov@google.com>2011-06-27 12:38:29 -0700
committerSvetoslav Ganov <svetoslavganov@google.com>2011-06-27 12:38:35 -0700
commitf2dd2dfb6cd46166ddbd03d35e9cef98a4c0cbf8 (patch)
tree4e0fe1205bc97c6f319f4c1af2eea9087a9146c1
parentc18e7e73158f794064fed5017c6c1c9a288673bd (diff)
downloadframeworks_base-f2dd2dfb6cd46166ddbd03d35e9cef98a4c0cbf8.zip
frameworks_base-f2dd2dfb6cd46166ddbd03d35e9cef98a4c0cbf8.tar.gz
frameworks_base-f2dd2dfb6cd46166ddbd03d35e9cef98a4c0cbf8.tar.bz2
AccessibilityInjectorTest did not restore the default key binsings.
1. AccessibilityInjectorTest changes the key bindings and when done restores the defatult ones. The restoreation was not working. bug:4905620 Change-Id: I812bad0b748637ded0ce69ace12517511f62f726
-rw-r--r--core/tests/coretests/src/android/webkit/AccessibilityInjectorTest.java6
1 files changed, 3 insertions, 3 deletions
diff --git a/core/tests/coretests/src/android/webkit/AccessibilityInjectorTest.java b/core/tests/coretests/src/android/webkit/AccessibilityInjectorTest.java
index aedfbad..2ed7c52 100644
--- a/core/tests/coretests/src/android/webkit/AccessibilityInjectorTest.java
+++ b/core/tests/coretests/src/android/webkit/AccessibilityInjectorTest.java
@@ -95,7 +95,7 @@ public class AccessibilityInjectorTest
private WebView mWebView;
/** Used for caching the default bindings so they can be restored. */
- private String mDefaultKeyBindings;
+ private static String sDefaultKeyBindings;
/** The received selection string for assertion checking. */
private static String sReceivedSelectionString = SELECTION_STRING_UNKNOWN;
@@ -1696,7 +1696,7 @@ public class AccessibilityInjectorTest
*/
private void injectTestWebContentKeyBindings() {
ContentResolver contentResolver = getActivity().getContentResolver();
- mDefaultKeyBindings = Settings.Secure.getString(contentResolver,
+ sDefaultKeyBindings = Settings.Secure.getString(contentResolver,
Settings.Secure.ACCESSIBILITY_WEB_CONTENT_KEY_BINDINGS);
Settings.Secure.putString(contentResolver,
Settings.Secure.ACCESSIBILITY_WEB_CONTENT_KEY_BINDINGS, TEST_KEY_DINDINGS);
@@ -1708,7 +1708,7 @@ public class AccessibilityInjectorTest
private void restoreDefaultWebContentKeyBindings() {
Settings.Secure.putString(getActivity().getContentResolver(),
Settings.Secure.ACCESSIBILITY_WEB_CONTENT_KEY_BINDINGS,
- mDefaultKeyBindings);
+ sDefaultKeyBindings);
}
/**