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

Commit b97da12a authored by The Android Automerger's avatar The Android Automerger
Browse files

Merge branch 'froyo' into froyo-release

parents 8a7f4b1b 0e23025c

libs/utils/VectorImpl.cpp

+4 −1
Original line number Diff line number Diff line
@@ -173,9 +173,10 @@ status_t VectorImpl::sort(VectorImpl::compar_r_t cmp, void* state) 
                    if (!array) return NO_MEMORY;

                    temp = malloc(mItemSize);

                    if (!temp) return NO_MEMORY;

                    _do_construct(temp, 1);

                    item = reinterpret_cast<char*>(array) + mItemSize*(i);

                    curr = reinterpret_cast<char*>(array) + mItemSize*(i-1);

                } else {

                    _do_destroy(temp, 1);

                }



                _do_copy(temp, item, 1);
@@ -183,12 +184,14 @@ status_t VectorImpl::sort(VectorImpl::compar_r_t cmp, void* state) 
                ssize_t j = i-1;

                void* next = reinterpret_cast<char*>(array) + mItemSize*(i);                    

                do {

                    _do_destroy(next, 1);

                    _do_copy(next, curr, 1);

                    next = curr;

                    --j;

                    curr = reinterpret_cast<char*>(array) + mItemSize*(j);                    

                } while (j>=0 && (cmp(curr, temp, state) > 0));



                _do_destroy(next, 1);

                _do_copy(next, temp, 1);

            }

            i++;

opengl/libs/GLES2/gl2.cpp

+1 −1
Original line number Diff line number Diff line
@@ -114,6 +114,6 @@ void glEGLImageTargetRenderbufferStorageOES(GLenum target, GLeglImageOES image) 
{

    GLeglImageOES implImage = 

        (GLeglImageOES)egl_get_image_for_current_context((EGLImageKHR)image);

    __glEGLImageTargetRenderbufferStorageOES(target, image);

    __glEGLImageTargetRenderbufferStorageOES(target, implImage);

}

opengl/libs/GLES_CM/gl.cpp

+1 −1
Original line number Diff line number Diff line
@@ -185,6 +185,6 @@ void glEGLImageTargetRenderbufferStorageOES(GLenum target, GLeglImageOES image) 
{

    GLeglImageOES implImage = 

        (GLeglImageOES)egl_get_image_for_current_context((EGLImageKHR)image);

    __glEGLImageTargetRenderbufferStorageOES(target, image);

    __glEGLImageTargetRenderbufferStorageOES(target, implImage);

}

opengl/tests/testPauseResume/Android.mk

0 → 100644
+22 −0
Original line number Diff line number Diff line 
#########################################################################

# OpenGL ES JNI sample

# This makefile builds both an activity and a shared library.

#########################################################################

ifneq ($(TARGET_SIMULATOR),true) # not 64 bit clean



TOP_LOCAL_PATH:= $(call my-dir)



# Build activity



LOCAL_PATH:= $(call my-dir)

include $(CLEAR_VARS)



LOCAL_MODULE_TAGS := optional



LOCAL_SRC_FILES := $(call all-subdir-java-files)



LOCAL_PACKAGE_NAME := TestEGL



include $(BUILD_PACKAGE)



endif # TARGET_SIMULATOR

opengl/tests/testPauseResume/AndroidManifest.xml

0 → 100644
+38 −0
Original line number Diff line number Diff line 
<?xml version="1.0" encoding="utf-8"?>

<!--

/*

**

** Copyright 2009, The Android Open Source Project

**

** Licensed under the Apache License, Version 2.0 (the "License"); 

** you may not use this file except in compliance with the License. 

** You may obtain a copy of the License at 

**

**     http://www.apache.org/licenses/LICENSE-2.0 

**

** Unless required by applicable law or agreed to in writing, software 

** distributed under the License is distributed on an "AS IS" BASIS, 

** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. 

** See the License for the specific language governing permissions and 

** limitations under the License.

*/

-->



<manifest xmlns:android="http://schemas.android.com/apk/res/android"

    package="com.android.test">

    <uses-permission android:name="android.permission.INTERNET" />

    <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />

    <application

            android:label="@string/test_activity">

        <activity android:name="TestActivity"

                android:theme="@android:style/Theme.NoTitleBar.Fullscreen"

            	android:launchMode="singleTask"

            	android:screenOrientation="landscape"

            	android:configChanges="orientation|keyboardHidden">

            <intent-filter>

                <action android:name="android.intent.action.MAIN" />

                <category android:name="android.intent.category.LAUNCHER" />

            </intent-filter>

        </activity>

    </application>

</manifest>