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

Commit 5aaa94f9 authored by The Android Automerger's avatar The Android Automerger
Browse files

Merge branch 'froyo' into froyo-release

parents 633b273a f9b1a092

core/java/android/os/INetworkManagementService.aidl

+3 −7
Original line number Diff line number Diff line
@@ -191,14 +191,9 @@ interface INetworkManagementService 
    long getInterfaceRxCounter(String iface);



    /**

     * Configures RX bandwidth throttling on an interface

     * Configures bandwidth throttling on an interface

     */

    void setInterfaceRxThrottle(String iface, int kbps);



    /**

     * Configures TX bandwidth throttling on an interface

     */

    void setInterfaceTxThrottle(String iface, int kbps);

    void setInterfaceThrottle(String iface, int maxKbits, int rxKbps, int txKbps);



    /**

     * Returns the currently configured RX throttle values
@@ -211,4 +206,5 @@ interface INetworkManagementService 
     * for the specified interface

     */

    int getInterfaceTxThrottle(String iface);



}

core/java/android/webkit/WebTextView.java

+4 −2
Original line number Diff line number Diff line
@@ -818,8 +818,10 @@ import java.util.ArrayList; 
        boolean single = true;

        boolean inPassword = false;

        int maxLength = -1;

        int inputType = EditorInfo.TYPE_CLASS_TEXT

                | EditorInfo.TYPE_TEXT_VARIATION_WEB_EDIT_TEXT;

        int inputType = EditorInfo.TYPE_CLASS_TEXT;

        if (mWebView.nativeFocusCandidateHasNextTextfield()) {

            inputType |= EditorInfo.TYPE_TEXT_VARIATION_WEB_EDIT_TEXT;

        }

        int imeOptions = EditorInfo.IME_FLAG_NO_EXTRACT_UI

                | EditorInfo.IME_FLAG_NO_FULLSCREEN;

        switch (type) {

core/java/android/webkit/WebView.java

+1 −0
Original line number Diff line number Diff line
@@ -7168,6 +7168,7 @@ public class WebView extends AbsoluteLayout 
    private native int      nativeFindAll(String findLower, String findUpper);

    private native void     nativeFindNext(boolean forward);

    /* package */ native int      nativeFocusCandidateFramePointer();

    /* package */ native boolean  nativeFocusCandidateHasNextTextfield();

    private native boolean  nativeFocusCandidateIsPassword();

    private native boolean  nativeFocusCandidateIsRtlText();

    private native boolean  nativeFocusCandidateIsTextInput();

services/java/com/android/server/NetworkManagementService.java

+2 −10
Original line number Diff line number Diff line
@@ -564,19 +564,11 @@ class NetworkManagementService extends INetworkManagementService.Stub { 
        return getInterfaceCounter(iface, false);

    }



    private void setInterfaceThrottle(String iface, boolean rx, int kbps) {

    public void setInterfaceThrottle(String iface, int maxKbps, int rxKbps, int txKbps) {

        mContext.enforceCallingOrSelfPermission(

                android.Manifest.permission.CHANGE_NETWORK_STATE, "NetworkManagementService");

        mConnector.doCommand(String.format(

                "interface setthrottle %s %s %d", iface, (rx ? "rx" : "tx"), kbps));

    }



    public void setInterfaceRxThrottle(String iface, int kbps) {

        setInterfaceThrottle(iface, true, kbps);

    }



    public void setInterfaceTxThrottle(String iface, int kbps) {

        setInterfaceThrottle(iface, false, kbps);

                "interface setthrottle %s %d %d %d", iface, maxKbps, rxKbps, txKbps));

    }



    private int getInterfaceThrottle(String iface, boolean rx) {