From 610d1f1faefd353aa15f57dfa965528036178eae Mon Sep 17 00:00:00 2001 From: Svetoslav Ganov Date: Mon, 27 Jun 2011 12:38:29 -0700 Subject: DO NOT MERGE AccessibilityInjectorTest did not restore the default key binsings. CHERRY PICK FROM MASTER 1. AccessibilityInjectorTest changes the key bindings and when done restores the defatult ones. The restoreation was not working. bug:4905620 Change-Id: I812bad0b748637ded0ce69ace12517511f62f726 --- .../coretests/src/android/webkit/AccessibilityInjectorTest.java | 6 +++--- 1 file 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); } /** -- cgit v1.1