drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
android_frameworks_base/core/jni
History
Mathias Agopian fa6eda01a9 Merge commit 'goog/master' into merge_master 
Conflicts:
	libs/surfaceflinger/Layer.cpp
	libs/surfaceflinger/SurfaceFlinger.cpp
	opengl/libagl/egl.cpp
	opengl/libs/EGL/egl.cpp
	opengl/libs/GLES_CM/gl.cpp
	opengl/libs/GLES_CM/gl_api.in
	opengl/libs/gl_entries.in
	opengl/libs/tools/glapigen
2009-04-30 14:43:18 -07:00
..
android
am 77c9990: Merge change 599 into donut
2009-04-29 13:35:35 -07:00
ActivityManager.cpp
auto import from //depot/cupcake/@135843
2009-03-03 19:31:44 -08:00
android_bluetooth_BluetoothAudioGateway.cpp
auto import from //branches/cupcake/...@137197
2009-03-09 11:52:12 -07:00
android_bluetooth_common.cpp
AI 144392: am: CL 144241 Stop polling dbus.
2009-04-02 22:41:08 -07:00
android_bluetooth_common.h
AI 144392: am: CL 144241 Stop polling dbus.
2009-04-02 22:41:08 -07:00
android_bluetooth_Database.cpp
auto import from //depot/cupcake/@135843
2009-03-03 19:31:44 -08:00
android_bluetooth_HeadsetBase.cpp
auto import from //depot/cupcake/@135843
2009-03-03 19:31:44 -08:00
android_bluetooth_RfcommSocket.cpp
auto import from //depot/cupcake/@135843
2009-03-03 19:31:44 -08:00
android_bluetooth_ScoSocket.cpp
auto import from //depot/cupcake/@135843
2009-03-03 19:31:44 -08:00
android_database_CursorWindow.cpp
auto import from //depot/cupcake/@135843
2009-03-03 19:31:44 -08:00
android_database_SQLiteDatabase.cpp
auto import from //depot/cupcake/@135843
2009-03-03 19:31:44 -08:00
android_database_SQLiteDebug.cpp
auto import from //depot/cupcake/@135843
2009-03-03 19:31:44 -08:00
android_database_SQLiteProgram.cpp
auto import from //depot/cupcake/@135843
2009-03-03 19:31:44 -08:00
android_database_SQLiteQuery.cpp
auto import from //depot/cupcake/@135843
2009-03-03 19:31:44 -08:00
android_database_SQLiteStatement.cpp
auto import from //depot/cupcake/@135843
2009-03-03 19:31:44 -08:00
android_ddm_DdmHandleNativeHeap.cpp
auto import from //depot/cupcake/@135843
2009-03-03 19:31:44 -08:00
android_debug_JNITest.cpp
auto import from //depot/cupcake/@135843
2009-03-03 19:31:44 -08:00
android_emoji_EmojiFactory.cpp
auto import from //branches/cupcake/...@137197
2009-03-09 11:52:12 -07:00
android_graphics_PixelFormat.cpp
auto import from //depot/cupcake/@135843
2009-03-03 19:31:44 -08:00
android_hardware_Camera.cpp
auto import from //depot/cupcake/@135843
2009-03-03 19:31:44 -08:00
android_hardware_SensorManager.cpp
auto import from //depot/cupcake/@135843
2009-03-03 19:31:44 -08:00
android_location_GpsLocationProvider.cpp
gps: Fix missing return value in android_location_GpsLocationProvider_init
2009-04-30 15:17:49 -04:00
android_media_AudioRecord.cpp
auto import from //depot/cupcake/@135843
2009-03-03 19:31:44 -08:00
android_media_AudioSystem.cpp
auto import from //depot/cupcake/@135843
2009-03-03 19:31:44 -08:00
android_media_AudioTrack.cpp
Automated import from //branches/master/...@142373,142373
2009-03-24 22:42:57 -07:00
android_media_JetPlayer.cpp
Automated import from //branches/master/...@140869,140869
2009-03-24 18:46:20 -07:00
android_media_ToneGenerator.cpp
auto import from //depot/cupcake/@135843
2009-03-03 19:31:44 -08:00
android_message_digest_sha1.cpp
auto import from //depot/cupcake/@135843
2009-03-03 19:31:44 -08:00
android_net_LocalSocketImpl.cpp
auto import from //depot/cupcake/@135843
2009-03-03 19:31:44 -08:00
android_net_NetUtils.cpp
auto import from //depot/cupcake/@135843
2009-03-03 19:31:44 -08:00
android_net_wifi_Wifi.cpp
AI 146166: am: CL 145920 Don't filter out IPv6 multicast packets.
2009-04-14 12:08:54 -07:00
android_nio_utils.cpp
auto import from //depot/cupcake/@135843
2009-03-03 19:31:44 -08:00
android_nio_utils.h
auto import from //depot/cupcake/@135843
2009-03-03 19:31:44 -08:00
android_opengl_GLES10.cpp
Enable static Java APIs for OpenGL ES 1.1 extensions.
2009-04-24 13:07:17 -07:00
android_opengl_GLES10Ext.cpp
Manually merge 129, 174, and 233 from donut
2009-04-17 10:32:56 -07:00
android_opengl_GLES11.cpp
Manually merge 129, 174, and 233 from donut
2009-04-17 10:32:56 -07:00
android_opengl_GLES11Ext.cpp
Enable static Java APIs for OpenGL ES 1.1 extensions.
2009-04-24 13:07:17 -07:00
android_os_Debug.cpp
auto import from //depot/cupcake/@135843
2009-03-03 19:31:44 -08:00
android_os_FileUtils.cpp
auto import from //depot/cupcake/@135843
2009-03-03 19:31:44 -08:00
android_os_Hardware.cpp
auto import from //branches/cupcake_rel/...@140373
2009-03-18 17:39:46 -07:00
android_os_MemoryFile.cpp
auto import from //depot/cupcake/@135843
2009-03-03 19:31:44 -08:00
android_os_ParcelFileDescriptor.cpp
auto import from //branches/cupcake_rel/...@138607
2009-03-13 13:04:22 -07:00
android_os_Power.cpp
auto import from //branches/cupcake_rel/...@140373
2009-03-18 17:39:46 -07:00
android_os_StatFs.cpp
auto import from //depot/cupcake/@135843
2009-03-03 19:31:44 -08:00
android_os_SystemClock.cpp
auto import from //depot/cupcake/@135843
2009-03-03 19:31:44 -08:00
android_os_SystemProperties.cpp
auto import from //depot/cupcake/@135843
2009-03-03 19:31:44 -08:00
android_os_UEventObserver.cpp
auto import from //depot/cupcake/@135843
2009-03-03 19:31:44 -08:00
android_pim_EventRecurrence.cpp
auto import from //depot/cupcake/@135843
2009-03-03 19:31:44 -08:00
android_security_Md5MessageDigest.cpp
auto import from //depot/cupcake/@135843
2009-03-03 19:31:44 -08:00
android_server_BluetoothA2dpService.cpp
AI 144392: am: CL 144241 Stop polling dbus.
2009-04-02 22:41:08 -07:00
android_server_BluetoothDeviceService.cpp
AI 144392: am: CL 144241 Stop polling dbus.
2009-04-02 22:41:08 -07:00
android_server_BluetoothEventLoop.cpp
AI 144392: am: CL 144241 Stop polling dbus.
2009-04-02 22:41:08 -07:00
android_text_AndroidCharacter.cpp
auto import from //depot/cupcake/@135843
2009-03-03 19:31:44 -08:00
android_text_format_Time.cpp
auto import from //depot/cupcake/@136594
2009-03-05 14:34:35 -08:00
android_text_KeyCharacterMap.cpp
auto import from //depot/cupcake/@135843
2009-03-03 19:31:44 -08:00
android_util_AssetManager.cpp
auto import from //depot/cupcake/@135843
2009-03-03 19:31:44 -08:00
android_util_Base64.cpp
auto import from //depot/cupcake/@135843
2009-03-03 19:31:44 -08:00
android_util_Binder.cpp
auto import from //depot/cupcake/@135843
2009-03-03 19:31:44 -08:00
android_util_Binder.h
auto import from //depot/cupcake/@135843
2009-03-03 19:31:44 -08:00
android_util_EventLog.cpp
auto import from //depot/cupcake/@135843
2009-03-03 19:31:44 -08:00
android_util_FileObserver.cpp
auto import from //depot/cupcake/@136620
2009-03-05 15:45:10 -08:00
android_util_FloatMath.cpp
auto import from //depot/cupcake/@135843
2009-03-03 19:31:44 -08:00
android_util_Log.cpp
auto import from //depot/cupcake/@135843
2009-03-03 19:31:44 -08:00
android_util_Process.cpp
Add support for changing a threads scheduler group. Three groups are available (default, background non interactive, foreground boost). Setting a thread priority to PRIORITY_BACKGROUND will transparently change groups to background
2009-04-27 09:17:06 -07:00
android_util_StringBlock.cpp
auto import from //depot/cupcake/@135843
2009-03-03 19:31:44 -08:00
android_util_XmlBlock.cpp
auto import from //depot/cupcake/@135843
2009-03-03 19:31:44 -08:00
android_view_Display.cpp
auto import from //depot/cupcake/@135843
2009-03-03 19:31:44 -08:00
android_view_Surface.cpp
cleanup, remove unused fields. Also make sure that we don't systematically allocate a Surface in Surface.java if only a SurfaceControl is needed (Common case).
2009-04-16 20:30:22 -07:00
android_view_ViewRoot.cpp
auto import from //depot/cupcake/@135843
2009-03-03 19:31:44 -08:00
Android.mk
Merge commit 'goog/master' into merge_master
2009-04-30 14:43:18 -07:00
AndroidRuntime.cpp
am 3de05ff: Merge change 586 into donut
2009-04-29 13:35:33 -07:00
BindTest.cpp
auto import from //depot/cupcake/@135843
2009-03-03 19:31:44 -08:00
com_android_internal_graphics_NativeUtils.cpp
auto import from //depot/cupcake/@135843
2009-03-03 19:31:44 -08:00
com_android_internal_os_ZygoteInit.cpp
auto import from //depot/cupcake/@135843
2009-03-03 19:31:44 -08:00
com_google_android_gles_jni_EGLImpl.cpp
Integrate from //sandbox/mathias/donut/...@145728
2009-04-10 14:24:30 -07:00
com_google_android_gles_jni_GLImpl.cpp
Manually merge 129, 174, and 233 from donut
2009-04-17 10:32:56 -07:00
CursorWindow.cpp
auto import from //depot/cupcake/@135843
2009-03-03 19:31:44 -08:00
CursorWindow.h
auto import from //depot/cupcake/@135843
2009-03-03 19:31:44 -08:00
GraphicsExternGlue.h
auto import from //depot/cupcake/@135843
2009-03-03 19:31:44 -08:00
GraphicsRegisterGlue.h
auto import from //depot/cupcake/@135843
2009-03-03 19:31:44 -08:00
MODULE_LICENSE_APACHE2
auto import from //depot/cupcake/@135843
2009-03-03 19:31:44 -08:00
NOTICE
auto import from //depot/cupcake/@135843
2009-03-03 19:31:44 -08:00
sqlite3_exception.h
auto import from //depot/cupcake/@135843
2009-03-03 19:31:44 -08:00