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

Commit 44e39d60 authored by The Android Automerger's avatar The Android Automerger
Browse files

Merge remote branch 'goog/honeycomb-mr2' into honeycomb-LTE

parents 5de8226c 158e3582

core/java/android/webkit/HTML5VideoViewProxy.java

+3 −1
Original line number Diff line number Diff line
@@ -184,7 +184,9 @@ class HTML5VideoViewProxy extends Handler 
                // we need to pause the old one and re-create a new media player

                // inside the HTML5VideoView.

                if (mHTML5VideoView != null) {

                    if (!backFromFullScreenMode) {

                        mHTML5VideoView.pauseAndDispatch(mCurrentProxy);

                    }

                    // release the media player to avoid finalize error

                    mHTML5VideoView.release();

                }

core/jni/android_net_wifi_Wifi.cpp

+3 −1
Original line number Diff line number Diff line
@@ -459,7 +459,9 @@ static jint android_net_wifi_getPowerModeCommand(JNIEnv* env, jobject clazz) 
    }

    // reply comes back in the form "powermode = XX" where XX is the

    // number we're interested in.

    sscanf(reply, "%*s = %u", &power);

    if (sscanf(reply, "%*s = %u", &power) != 1) {

        return (jint)-1;

    }

    return (jint)power;

}