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

DO NOT MERGE AccessibilityInjectorTest did not restore the default key binsings.

Browse Source 
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
This commit is contained in:
Svetoslav Ganov
2011-06-27 12:38:29 -07:00
parent 1c82f56f24
commit 610d1f1fae
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
core/tests/coretests/src/android/webkit/AccessibilityInjectorTest.java
View File

@@ -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);
}
/**