Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 3e930dba authored by Svetoslav Ganov's avatar Svetoslav Ganov Committed by Android Git Automerger
Browse files

am d1b4c10f: Merge "DO NOT MERGE AccessibilityInjectorTest did not restore the... 

am d1b4c10f: Merge "DO NOT MERGE AccessibilityInjectorTest did not restore the default key binsings." into honeycomb-LTE

* commit 'd1b4c10f':
  DO NOT MERGE AccessibilityInjectorTest did not restore the default key binsings.
parents 19933916 d1b4c10f

core/tests/coretests/src/android/webkit/AccessibilityInjectorTest.java

+3 −3
Original line number Diff line number Diff line
@@ -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);

    }



    /**