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

Commit 7816eded authored by David 'Digit' Turner's avatar David 'Digit' Turner
Browse files

merge intel x86 patches into gingerbread branch

parents 4d825e1f 2435a927

opengl/tests/gl_jni/jni/gl_code.cpp

+0 −1
Original line number Diff line number Diff line
@@ -181,4 +181,3 @@ JNIEXPORT void JNICALL Java_com_android_gljni_GLJNILib_changeBackground(JNIEnv * 
{

    background = 1.0f - background;

}

services/java/com/android/server/NativeDaemonConnector.java

+2 −1
Original line number Diff line number Diff line
@@ -97,10 +97,11 @@ final class NativeDaemonConnector implements Runnable { 
                    LocalSocketAddress.Namespace.RESERVED);



            socket.connect(address);



            mOutputStream = socket.getOutputStream();

            mCallbacks.onDaemonConnected();



            InputStream inputStream = socket.getInputStream();

            mOutputStream = socket.getOutputStream();



            byte[] buffer = new byte[BUFFER_SIZE];

            int start = 0;

libs/rs/rsNoise.cpp

+1 −1

File changed.

Contains only whitespace changes.