LineageOS/android_development
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
8,931 Commits 2 Branches 0 Tags
ad37ddbb1d000dba470148e4251489c79b5cba91
Commit Graph

8931 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Jesse Hall
ad37ddbb1d Merge "resolved conflicts for merge of c765e79a to master" 2012-02-27 20:56:00 -08:00
Mathias Agopian
f60103a9a7 Merge "Android native include paths and symbols for Eclipse IDE" 2012-02-27 18:22:12 -08:00
Guang Zhu
8df87bdd73 Merge "Update the intent that monkey uses to launch application" 2012-02-27 16:37:11 -08:00
Guang Zhu
73421de1a0 Update the intent that monkey uses to launch application 
The purpose of the monkey event is to imitate user action of
launching an app from launcher, and apparently launcher is
using one extra flag FLAG_ACTIVITY_RESET_TASK_IF_NEEDED

Bug: 6007633
Change-Id: Ie42cc84fd6235c9419b96bd9574056ed46687b25
 2012-02-27 14:38:55 -08:00
Jesse Hall
073e40031c resolved conflicts for merge of c765e79a to master 
Change-Id: Id7018ac9f551ec8b224f030d8b04229ac2407a17
 2012-02-27 14:12:32 -08:00
Jesse Hall
5333119e45 am a59610fa: am 9e016ede: am cbc7300c: EmuGL: enable SurfaceTexture async mode 
* commit 'a59610fab6893530f15a9cfad8cdd97e4c5d578a':
  EmuGL: enable SurfaceTexture async mode
 2012-02-27 14:00:23 -08:00
Jesse Hall
c765e79a83 am 124d1804: am 7ef79e49: EmuGL: don\'t [de]queue buffers in eglMakeCurrent 
* commit '124d18041b8c262f47e16a3e10d26f35e9deb597':
  EmuGL: don't [de]queue buffers in eglMakeCurrent
 2012-02-27 13:57:57 -08:00
Jesse Hall
a59610fab6 am 9e016ede: am cbc7300c: EmuGL: enable SurfaceTexture async mode 
* commit '9e016ede0973c0abad33de07d92c7cb8bee09cd2':
  EmuGL: enable SurfaceTexture async mode
 2012-02-27 13:57:55 -08:00
Jesse Hall
124d18041b am 7ef79e49: EmuGL: don\'t [de]queue buffers in eglMakeCurrent 
* commit '7ef79e49c7e8f1ecf19a92114f41de39d102a3e8':
  EmuGL: don't [de]queue buffers in eglMakeCurrent
 2012-02-27 13:55:39 -08:00
Jesse Hall
9e016ede09 am cbc7300c: EmuGL: enable SurfaceTexture async mode 
* commit 'cbc7300cb209a4fd3b250546c72c35b7bb0aa8a1':
  EmuGL: enable SurfaceTexture async mode
 2012-02-27 13:55:37 -08:00
Mathias Agopian
9789239a2f Android native include paths and symbols for Eclipse IDE 
these are required to get the indexer working properly. the list might
not be 100% complete, but it seems to work with the vast majority
of the sources in the tree.

Change-Id: I2a899ebc8b35b8d024cc3499539489cca0127606
 2012-02-27 13:29:10 -08:00
Mathias Agopian
a3b1c78767 remove dependency on android_natives_priv.h 
Change-Id: If06ea9aeb836d6ceb09745770956a25211f428d3
 2012-02-24 18:04:51 -08:00
Jesse Hall
7ef79e49c7 EmuGL: don't [de]queue buffers in eglMakeCurrent 
Whenever a surface was attached to a context, it was dequeing a new
buffer, and enqueing it when detached. This has the effect of doing a
SwapBuffers on detach/attach cycle, which is just wrong and
occasionally caused visible glitches (e.g. animations going backwards
for one frame). It also broke some SurfaceTexture tests which
(validly) depend on specific buffer production/consumption counts.

Change-Id: Ibd4761e8842871b79fd9edf52272900193cb672d
 2012-02-24 15:54:59 -08:00
Jesse Hall
cbc7300cb2 EmuGL: enable SurfaceTexture async mode 
Pass the swap interval from eglSwapInterval to the native window so it
can enable/disable SurfaceTexture's async mode. Fixes the deadlock in
SurfaceTextureGLToGLTest.EglDestroySurfaceUnrefsBuffers.

Change-Id: I19bf69247341f5617223722df63d6c7f8cf389c6
 2012-02-24 15:54:58 -08:00
The Android Open Source Project
85a3dd914e am 1e40e843: am ee87007e: Reconcile with ics-mr1-release 
* commit '1e40e8433d783e4f06be1fb4029fdceca1e7ad6a':
 2012-02-24 14:11:35 -08:00
The Android Open Source Project
1e40e8433d am ee87007e: Reconcile with ics-mr1-release 
* commit 'ee87007e15b1c171911e43713582efd9b187d205':
 2012-02-24 14:09:27 -08:00
The Android Open Source Project
ee87007e15 Reconcile with ics-mr1-release 
Change-Id: Iea2f9c952029f0b86da7a550c2c2bf7c8a1be485
 2012-02-24 14:05:47 -08:00
The Android Open Source Project
784b6b74df am 56174149: am 05d10ed4: Reconcile with ics-mr1-release 
* commit '561741493b4f99135dd840c7f1da15a2199a4775':
 2012-02-24 14:01:54 -08:00
The Android Open Source Project
561741493b am 05d10ed4: Reconcile with ics-mr1-release 
* commit '05d10ed415f5025e6ee6cf657184c1455d03d2a4':
 2012-02-24 13:59:22 -08:00
The Android Open Source Project
05d10ed415 Reconcile with ics-mr1-release 
Change-Id: I55bb8fb60cb7af23c0219a32aa18a25031592bbf
 2012-02-24 13:57:35 -08:00
Jesse Hall
2db4ff57d5 am 23abe1ec: am f5229261: am 8bd39ae1: Merge "EmuGL: GLESv2 support for OES_EGL_image_external" into ics-mr1 
* commit '23abe1ec1fff3e0e8242aa842865f691ac73040b':
 2012-02-24 12:13:46 -08:00
Jesse Hall
23abe1ec1f am f5229261: am 8bd39ae1: Merge "EmuGL: GLESv2 support for OES_EGL_image_external" into ics-mr1 
* commit 'f522926103c9bbbe6a05cd191f287de6f35930b3':
 2012-02-24 12:12:01 -08:00
Jesse Hall
f3c068c79a am bcd311ce: am 9cb15c9e: am 8bd39ae1: Merge "EmuGL: GLESv2 support for OES_EGL_image_external" into ics-mr1 
* commit 'bcd311ce0b17d892f87d2e31741dc1873491d20f':
  EmuGL: GLESv2 support for OES_EGL_image_external
 2012-02-24 12:11:52 -08:00
Jesse Hall
bcd311ce0b am 9cb15c9e: am 8bd39ae1: Merge "EmuGL: GLESv2 support for OES_EGL_image_external" into ics-mr1 
* commit '9cb15c9e813e03f961634f868b0d4b869a04fa57':
  EmuGL: GLESv2 support for OES_EGL_image_external
 2012-02-24 12:10:11 -08:00
Jesse Hall
9cb15c9e81 am 8bd39ae1: Merge "EmuGL: GLESv2 support for OES_EGL_image_external" into ics-mr1 
* commit '8bd39ae17caac6d275d785ce9420d7e643f15eb9':
  EmuGL: GLESv2 support for OES_EGL_image_external
 2012-02-24 12:08:38 -08:00
Jesse Hall
f522926103 am 8bd39ae1: Merge "EmuGL: GLESv2 support for OES_EGL_image_external" into ics-mr1 
* commit '8bd39ae17caac6d275d785ce9420d7e643f15eb9':
  EmuGL: GLESv2 support for OES_EGL_image_external
 2012-02-24 12:08:18 -08:00
Jesse Hall
8bd39ae17c Merge "EmuGL: GLESv2 support for OES_EGL_image_external" into ics-mr1 2012-02-24 12:06:20 -08:00
Tor Norbye
372ca7fd9d am 99c486f8: (-s ours) am c85a73bf: am 01076305: Fix version metadata for java.lang.reflect.Field. do not merge. 
* commit '99c486f88faa71b51eff171c46043d7aef54d44a':
 2012-02-23 18:16:27 -08:00
Tor Norbye
a9400477e7 am 1c0deccd: (-s ours) am 9ce81e38: am 01076305: Fix version metadata for java.lang.reflect.Field. do not merge. 
* commit '1c0deccda983acb97fdcc843f87aab00abdc4e30':
  Fix version metadata for java.lang.reflect.Field. do not merge.
 2012-02-23 18:14:22 -08:00
Tor Norbye
99c486f88f am c85a73bf: am 01076305: Fix version metadata for java.lang.reflect.Field. do not merge. 
* commit 'c85a73bf281bd96510334d413845da99af31b54c':
 2012-02-23 18:13:13 -08:00
Tor Norbye
1c0deccda9 am 9ce81e38: am 01076305: Fix version metadata for java.lang.reflect.Field. do not merge. 
* commit '9ce81e383a7d16be39f0598c077d57b2373fd510':
  Fix version metadata for java.lang.reflect.Field. do not merge.
 2012-02-23 18:12:42 -08:00
Tor Norbye
9ce81e383a am 01076305: Fix version metadata for java.lang.reflect.Field. do not merge. 
* commit '010763059f205a0060455acc158c95c7183f5c91':
  Fix version metadata for java.lang.reflect.Field. do not merge.
 2012-02-23 18:10:21 -08:00
Tor Norbye
c85a73bf28 am 01076305: Fix version metadata for java.lang.reflect.Field. do not merge. 
* commit '010763059f205a0060455acc158c95c7183f5c91':
  Fix version metadata for java.lang.reflect.Field. do not merge.
 2012-02-23 18:10:15 -08:00
Tor Norbye
010763059f Fix version metadata for java.lang.reflect.Field. do not merge. 
(cherry picked from commit 9ada0ac8f4)

Change-Id: Ic51aaa81e5a569a6384ac4e9f26b715801e13f1d
 2012-02-23 18:07:42 -08:00
Yu Shan Emily Lau
fcf03991f9 Merge "Add the camera functional continuous test." 2012-02-23 17:54:46 -08:00
Xavier Ducrohet
664ee56ed1 Merge "Fix version metadata for java.lang.reflect.Field" 2012-02-23 17:42:04 -08:00
Yu Shan Emily Lau
9ba4eff7eb Add the camera functional continuous test. 
Change-Id: I5f9a35f6d3182ed88fc3ae2d49e2261589dab45b
 2012-02-23 15:39:52 -08:00
Jesse Hall
1113971f9e am a599ef02: am ac8acce5: am 00e61338: EmuGL: refinements to GLESv1 image_external 
* commit 'a599ef023f3b81ca46ee655ac450a7f70a15cab8':
 2012-02-23 12:25:50 -08:00
Jesse Hall
72efa999d1 am ba8c8d15: am 66a386e3: am 00e61338: EmuGL: refinements to GLESv1 image_external 
* commit 'ba8c8d1591a25b13047b24c10a1315ff178b2160':
  EmuGL: refinements to GLESv1 image_external
 2012-02-23 12:25:49 -08:00
Jesse Hall
fbb3824150 am f217f206: am 71f28afa: am ac018fe3: EmuGL: refcount ColorBuffers on the host 
* commit 'f217f2062dd7f4ac962155c59136b759a0d8922f':
 2012-02-23 12:25:48 -08:00
Jesse Hall
1d4fcce585 am 4660966b: am 144e1b59: am ac018fe3: EmuGL: refcount ColorBuffers on the host 
* commit '4660966b791d8ea1be086a9ab0c58c672cca36ee':
  EmuGL: refcount ColorBuffers on the host
 2012-02-23 12:25:47 -08:00
Jesse Hall
cffc41d466 am 031ea39c: am 1a5e2350: am 91d4e8e1: GLESv2 translator: don\'t delete EGLImage textures 
* commit '031ea39c25fa95916048a6d6f117d06954849e99':
 2012-02-23 12:22:31 -08:00
Jesse Hall
c2aa2cd77e am 2419e67b: am fc7a319e: am 91d4e8e1: GLESv2 translator: don\'t delete EGLImage textures 
* commit '2419e67b07de7cdb7f502bb69634b23c147f899a':
  GLESv2 translator: don't delete EGLImage textures
 2012-02-23 12:22:30 -08:00
Tor Norbye
9ada0ac8f4 Fix version metadata for java.lang.reflect.Field 
Change-Id: Ic36c5a36270173fd7a17d649c71a914c6ffad7a0
 2012-02-23 12:04:04 -08:00
The Android Automerger
02cffa999e merge in ics-mr1-release history after reset to ics-mr1 2012-02-23 10:44:06 -08:00
The Android Open Source Project
c8bf23b2da am 5cba0cbc: am f57689a2: Reconcile with ics-mr1-release 
* commit '5cba0cbcace372c3a4be206c1d66589ba84d3c92':
 2012-02-23 07:29:10 -08:00
The Android Open Source Project
a738ebf458 am 1800a2f2: am 790c9ce6: Reconcile with ics-mr1-release 
* commit '1800a2f2d816a9c0b58f6ebb468e76d9d1911c8e':
 2012-02-23 07:29:03 -08:00
Jesse Hall
d6bd1843ce EmuGL: GLESv2 support for OES_EGL_image_external 
Change-Id: I8911328d5dcccdf4731bd2d8fd953c12fdec5f1b
 2012-02-22 15:03:30 -08:00
Jesse Hall
a599ef023f am ac8acce5: am 00e61338: EmuGL: refinements to GLESv1 image_external 
* commit 'ac8acce59ede348ccc857754b9b65f29fe59779f':
 2012-02-22 13:51:47 -08:00
Jesse Hall
ba8c8d1591 am 66a386e3: am 00e61338: EmuGL: refinements to GLESv1 image_external 
* commit '66a386e33a23b48b59eae17888c12d7f85d6cdfd':
  EmuGL: refinements to GLESv1 image_external
 2012-02-22 13:50:07 -08:00