Commit Graph

8345 Commits

Author SHA1 Message Date
The Android Automerger
42b3762e62 merge in ics-mr1-release history after reset to ics-mr1 2012-02-28 15:13:22 -08:00
The Android Automerger
aca0904697 merge in ics-mr1-release history after reset to ics-mr1 2012-02-25 10:42:21 -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
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
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
The Android Automerger
02cffa999e merge in ics-mr1-release history after reset to ics-mr1 2012-02-23 10:44:06 -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
00e61338b8 EmuGL: refinements to GLESv1 image_external
* EGLImageTargetRenderbufferStorageOES was incorrectly accepting
  TEXTURE_EXTERNAL_OES as a target. Revert that; the host GL will
  correctly reject it with INVALID_ENUM.

* Handle the REQUIRED_TEXTURE_IMAGE_UNITS_OES texparameter query.

* Validate texture parameters set on TEXTURE_EXTERNAL textures;
  otherwise invalid parameters would work on the emulator but not on a
  real device.

Change-Id: I49a088608d58a9822f33e5916bd354eee3709127
2012-02-21 11:13:20 -08:00
Jesse Hall
ac018fe3f6 EmuGL: refcount ColorBuffers on the host
The gralloc API assumes system-wide reference counting of gralloc
buffers. The host-GL accelerated gralloc maps buffers to host-side
ColorBuffer objects, but was destroying them unconditionally in
gralloc_free(), ignoring any additional references from
gralloc_register_buffer().

This affected the SurfaceTexture gralloc buffers used by the
Browser/WebView. For some reason these buffers are actually allocated
by SurfaceFlinger and passed back to the WebView through Binder. But
since SurfaceFlinger doesn't actually need the buffer for anything,
sometime after the WebView has called gralloc_register_buffer()
SurfaceFlinger calls gralloc_free() on it. This caused the host
ColorBuffer to be destroyed long before the WebView is done using it.

Change-Id: I33dbee887a48a6907041cf19e9f38a1f6c983eff
2012-02-21 11:13:20 -08:00
Jesse Hall
91d4e8e195 GLESv2 translator: don't delete EGLImage textures
Copy changes faaf1553cf and
f37a7ed6c5 from the GLESv1 translator to
the GLESv2 translator. After this, both translators use the same logic
for glEGLImageTargetTexture2DOES().

Change-Id: I0a95bf2301df7b7428abc593f38170edf4cbda30
2012-02-21 11:13:19 -08:00
The Android Automerger
cecde327e3 merge in ics-mr1-release history after reset to ics-mr1 2012-02-16 16:24:50 -08:00
Xavier Ducrohet
fd9cdb46a0 Increase platform sdk package revision. do not merge.
Change-Id: I51125369a0b2ba1376a66924b04b0cd825d82f5d
2012-02-16 15:31:20 -08:00
Xavier Ducrohet
52feec594a Update rev numbers of SDK packages. DO NOT MERGE.
Change-Id: Idc750d5bd63186157cd2cb08c28e73e9894c34bd
2012-02-15 18:32:11 -08:00
The Android Automerger
d16ed56822 merge in ics-mr1-release history after reset to ics-mr1 2012-02-14 14:14:35 -08:00
Adam Powell
15a14930d7 Merge "Add AppNavigation demo" into ics-mr1 2012-02-13 14:27:58 -08:00
Scott Main
de797a2fb2 Merge "docs: fix minsdkversion for native activity sample" into ics-mr1 2012-02-09 12:15:07 -08:00
Scott Main
41b5bb95c3 docs: fix minsdkversion for native activity sample
Change-Id: I2d45207182f6a5b1743b574f7ab10251efd3a17a
2012-02-09 12:10:27 -08:00
Adam Powell
247df4fe79 Add AppNavigation demo
This demo illustrates the use of the new support library functionality
for navigating within and across tasks using "up" navigation. This
matches the recommendations in the Android design guide.

Change-Id: I2b36c962dd24f0e0f3b3ee3f86319dafc2fc66e2
2012-02-07 15:02:57 -08:00
Jesse Hall
0e981c8304 EmuGL: Fix heap corruption
Off-by-two bug when removing textures from the tracking array could
overwrite malloc's mem chunk data structure, usually resulting in a
heap corruption abort on a later malloc/realloc/free.

Bug: 5951738
Change-Id: I11056bb62883373c2a3403f53899347ff8cdabf2
2012-02-03 22:54:24 -08:00
Trevor Johns
47365074a0 Merge "Adding Android Developers Google+ redirect" into ics-mr1 2012-02-03 13:08:46 -08:00
Trevor Johns
7a94a9dc49 Merge "Adding manual redirect support to developer.android.com." into ics-mr1 2012-02-03 13:08:23 -08:00
Trevor Johns
22f4efaa12 Adding Android Developers Google+ redirect
Redirect developer.android.com/+ to Google+ page for Android Developers.

Issue: 5933956

Change-Id: I0ed2b076386058f1ac81ea4376aea15fee6b24aa
2012-02-03 12:32:10 -08:00
Xavier Ducrohet
df458cb832 Fix api version file with proper data enum.
The generator tool was broken during the generics fix.

Change-Id: I7e375000ac52fba27af7992ffebb5858baf20b3a
2012-01-31 19:18:06 -08:00
Xavier Ducrohet
e11b2d6c9f Update api version file with stripped generics info.
Change-Id: Iac38c14115757cbfa75808ce5e476912da80543d
2012-01-31 15:44:27 -08:00
The Android Automerger
1c33479a7c merge in ics-mr1-release history after reset to ics-mr1 2012-01-31 15:41:33 -08:00
The Android Automerger
672a32cc9c merge in ics-mr1-release history after reset to ics-mr1 2012-01-30 23:33:27 -08:00
The Android Automerger
9771093ab8 merge in ics-mr1-release history after reset to ics-mr1 2012-01-30 13:22:25 -08:00
Dianne Hackborn
97d0a1db24 Merge "Fix bug in the new notification sample." into ics-mr1 2012-01-30 12:52:26 -08:00
Dianne Hackborn
376e000436 Fix bug in the new notification sample.
Change-Id: I021c5f374857d1affdddd8be37c0f441aaf14c95
2012-01-30 11:44:05 -08:00
Yu Shan Emily Lau
979806b0a8 Regular monkey should not write script log.
Change-Id: I225cb01d3fb81478ea0e13cc4a6546d71d16d251
2012-01-30 11:08:53 -08:00
Trevor Johns
e12dad21f0 Merge "Generate a valid main.py for use with developer.android.com." into ics-mr1 2012-01-30 10:27:05 -08:00
Trevor Johns
662b8f1c9a Adding manual redirect support to developer.android.com.
Internal bug: 2347145

Change-Id: I0cdcec8a23704ab80878e8cc781b735fd2173011
2012-01-27 20:16:15 -08:00
Trevor Johns
e52271aff9 Generate a valid main.py for use with developer.android.com.
This fixes bugs in divide_and_compress_constants.py that caused a corrupt
main.py file to be generated for developer.android.com. Specifically,
extra quotes are no longer added, __main__ is now in quotes, and
webapp.WSGIApplication() parameters are now correct.

Also moved the call to memcache_zipserve.create_handler() to a seperate
line for readability.

Change-Id: I8906c54e70b2889389a95b92d4fbcf05a6c3e22d
2012-01-27 20:08:25 -08:00
Xavier Ducrohet
d4f9372a4d Merge "Move api.xml from tools/ to platform-tools/" into ics-mr1 2012-01-27 12:00:38 -08:00
Tor Norbye
82374f6d8d Move api.xml from tools/ to platform-tools/
The API database was generated with code in sdk/apicheck/.

Change-Id: I42559fb47716f8ea2ee2d836375b523644dfe41c
2012-01-27 11:59:10 -08:00
Robert Ly
5d1dd1c68f Merge "updating the SampleSyncAdapter sample to add stream item and photo code" into ics-mr1 2012-01-27 09:04:48 -08:00
The Android Automerger
9c3b45bd1c merge in ics-mr1-release history after reset to ics-mr1 2012-01-25 12:08:07 -08:00
Dianne Hackborn
85241cc795 Add button to clear back stack.
Change-Id: I4f02714ec349055a486608ff0eab75a46d6ba7cd
2012-01-24 13:39:02 -08:00
Robert Ly
74c1836184 updating the SampleSyncAdapter sample to add stream item and photo code
Change-Id: Ic5f16194fc0d0314d9170a8598eccc17b6a4e26c
2012-01-23 17:58:16 -08:00
Robert Ly
3d398d7243 Revert "updating the SampleSyncAdapter sample to add stream item and photo code"
This reverts commit 7a98345fc5
2012-01-20 11:07:10 -08:00
The Android Automerger
deda7c815c merge in ics-mr1-release history after reset to ics-mr1 2012-01-19 16:28:01 -08:00
Robert Ly
7a98345fc5 updating the SampleSyncAdapter sample to add stream item and photo code
Change-Id: I6d44ea3f912a3d1e52695bda785c81ff527160d5
2012-01-19 14:51:23 -08:00
Dianne Hackborn
2a9de0211d Clean up and extend the linkify sample.
Change-Id: If9d0451af3bfcdcd8bafb325f4b7978857efab7e
2012-01-13 14:00:01 -08:00
The Android Automerger
c9011c7f3c merge in ics-mr1-release history after reset to ics-mr1 2012-01-12 14:00:47 -08:00
Jesse Hall
4f66a14d53 Merge "EmuGL: handle NULL data in glBufferData" into ics-mr1 2012-01-11 17:10:35 -08:00
Xavier Ducrohet
a318515c0d Merge "Move platform 15 sdk rev to 2. do not merge." into ics-mr1 2012-01-11 17:08:47 -08:00
Xavier Ducrohet
e4627619b3 Move platform 15 sdk rev to 2. do not merge.
Change-Id: I8c3ab6cce4305afcd380b23ed0638169676d5d97
2012-01-11 17:08:18 -08:00
The Android Automerger
c8b86c1add merge in ics-mr1-release history after reset to ics-mr1 2012-01-11 16:28:10 -08:00
Katie McCormick
e065fd6209 Merge "Doc change: updated index page for HDP sample." into ics-mr1 2012-01-11 16:02:50 -08:00