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

8590 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
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
Jesse Hall
f217f2062d am 71f28afa: am ac018fe3: EmuGL: refcount ColorBuffers on the host 
* commit '71f28afa4cdfa5993c03f23da3c6602d00b81632':
 2012-02-22 13:48:41 -08:00
Jesse Hall
4660966b79 am 144e1b59: am ac018fe3: EmuGL: refcount ColorBuffers on the host 
* commit '144e1b59982892051c91b1c135a7c5a151cc342d':
  EmuGL: refcount ColorBuffers on the host
 2012-02-22 13:48:20 -08:00
Jesse Hall
66a386e33a am 00e61338: EmuGL: refinements to GLESv1 image_external 
* commit '00e61338b8374de090e81537047846ca06f88280':
  EmuGL: refinements to GLESv1 image_external
 2012-02-22 13:47:27 -08:00
Jesse Hall
ac8acce59e am 00e61338: EmuGL: refinements to GLESv1 image_external 
* commit '00e61338b8374de090e81537047846ca06f88280':
  EmuGL: refinements to GLESv1 image_external
 2012-02-22 13:47:22 -08:00
Jesse Hall
144e1b5998 am ac018fe3: EmuGL: refcount ColorBuffers on the host 
* commit 'ac018fe3f65e18083a2dd317f73e4139bfa5fee6':
  EmuGL: refcount ColorBuffers on the host
 2012-02-22 13:45:42 -08:00
Jesse Hall
71f28afa4c am ac018fe3: EmuGL: refcount ColorBuffers on the host 
* commit 'ac018fe3f65e18083a2dd317f73e4139bfa5fee6':
  EmuGL: refcount ColorBuffers on the host
 2012-02-22 13:45:34 -08:00
Jesse Hall
031ea39c25 am 1a5e2350: am 91d4e8e1: GLESv2 translator: don\'t delete EGLImage textures 
* commit '1a5e2350745b97b9e7ea415376b1312fa63b2369':
 2012-02-22 10:15:38 -08:00
Jesse Hall
2419e67b07 am fc7a319e: am 91d4e8e1: GLESv2 translator: don\'t delete EGLImage textures 
* commit 'fc7a319e5c60cb634df20d6a7fcb6f23a584b449':
  GLESv2 translator: don't delete EGLImage textures
 2012-02-22 10:15:27 -08:00
Jesse Hall
fc7a319e5c am 91d4e8e1: GLESv2 translator: don\'t delete EGLImage textures 
* commit '91d4e8e195592dbc812441597118452f887ea07d':
  GLESv2 translator: don't delete EGLImage textures
 2012-02-22 10:11:31 -08:00
Jesse Hall
1a5e235074 am 91d4e8e1: GLESv2 translator: don\'t delete EGLImage textures 
* commit '91d4e8e195592dbc812441597118452f887ea07d':
  GLESv2 translator: don't delete EGLImage textures
 2012-02-22 10:10:54 -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 Open Source Project
5cba0cbcac am f57689a2: Reconcile with ics-mr1-release 
* commit 'f57689a2875c5834e583d269149555f87eb69629':
 2012-02-17 09:04:05 -08:00
The Android Open Source Project
f57689a287 Reconcile with ics-mr1-release 
Change-Id: I6c51c02fe1de073b1bb5d3cd73e9a072286b4cb8
 2012-02-17 09:02:42 -08:00
The Android Open Source Project
1800a2f2d8 am 790c9ce6: Reconcile with ics-mr1-release 
* commit '790c9ce6591f4f3f5abfbf4de6f056c10f491800':
 2012-02-17 08:11:34 -08:00
The Android Open Source Project
790c9ce659 Reconcile with ics-mr1-release 
Change-Id: Ied11f64a3034d8c8a29f2c68151f3e23564c6a69
 2012-02-17 08:09:27 -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
47a86260ee am 95605614: am fd9cdb46: Increase platform sdk package revision. do not merge. 
* commit '95605614afcbcc77b80f90124085516637be11cf':
 2012-02-16 15:36:29 -08:00
Xavier Ducrohet
8ed7b3bef6 am b89ad503: am fd9cdb46: Increase platform sdk package revision. do not merge. 
* commit 'b89ad503b3840d5c3f2686c9f19183ce1c711404':
  Increase platform sdk package revision. do not merge.
 2012-02-16 15:36:01 -08:00
Xavier Ducrohet
95605614af am fd9cdb46: Increase platform sdk package revision. do not merge. 
* commit 'fd9cdb46a064d3ecc46aa05fa9c023ae648f07f1':
  Increase platform sdk package revision. do not merge.
 2012-02-16 15:34:11 -08:00
Xavier Ducrohet
b89ad503b3 am fd9cdb46: Increase platform sdk package revision. do not merge. 
* commit 'fd9cdb46a064d3ecc46aa05fa9c023ae648f07f1':
  Increase platform sdk package revision. do not merge.
 2012-02-16 15:33:18 -08:00
Xavier Ducrohet
fd9cdb46a0 Increase platform sdk package revision. do not merge. 
Change-Id: I51125369a0b2ba1376a66924b04b0cd825d82f5d
 2012-02-16 15:31:20 -08:00
The Android Open Source Project
d2cfa3f7ce am b6f94723: Reconcile with ics-mr1-release 
* commit 'b6f947238f459be80a9327890992c32bc89b5674':
 2012-02-16 10:16:10 -08:00
The Android Open Source Project
b6f947238f Reconcile with ics-mr1-release 
Change-Id: I846571d58584c9f58a20e8c9d1b144a93801c834
 2012-02-16 10:14:42 -08:00
The Android Open Source Project
5c74008434 am c263b345: Reconcile with ics-mr1-release 
* commit 'c263b3450fc291f367eb277e73b2b70060834707':
 2012-02-16 10:11:49 -08:00
The Android Open Source Project
c263b3450f Reconcile with ics-mr1-release 
Change-Id: Ibf45e3ef58ab7a50e362da85993c4332636f32f7
 2012-02-16 10:10:08 -08:00
Xavier Ducrohet
3837d4581e am ae0c9dfd: am 52feec59: Update rev numbers of SDK packages. DO NOT MERGE. 
* commit 'ae0c9dfd62619a2dec14291b4e292566beb008e5':
 2012-02-16 09:58:27 -08:00
Xavier Ducrohet
b0069f5644 am aa55fa50: am 52feec59: Update rev numbers of SDK packages. DO NOT MERGE. 
* commit 'aa55fa5061d768438506a5065700cefab539119f':
  Update rev numbers of SDK packages. DO NOT MERGE.
 2012-02-16 09:57:16 -08:00
Xavier Ducrohet
ae0c9dfd62 am 52feec59: Update rev numbers of SDK packages. DO NOT MERGE. 
* commit '52feec594a769653625f6089cfcd5398332922ea':
  Update rev numbers of SDK packages. DO NOT MERGE.
 2012-02-16 09:56:04 -08:00
Xavier Ducrohet
aa55fa5061 am 52feec59: Update rev numbers of SDK packages. DO NOT MERGE. 
* commit '52feec594a769653625f6089cfcd5398332922ea':
  Update rev numbers of SDK packages. DO NOT MERGE.
 2012-02-16 09:55:44 -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
Jean-Baptiste Queru
0f043b53fe am 2ea5b27e: am 96a4c245: am 5539b1bf: Merge "Merge "Projects whitelisted for Windows SDK compilation."" 
* commit '2ea5b27ef56cb5666dabd09aec2289b3d80ad6ad':
  Merge "Projects whitelisted for Windows SDK compilation."
 2012-02-14 16:25:15 -08:00
Jean-Baptiste Queru
2ea5b27ef5 am 96a4c245: am 5539b1bf: Merge "Merge "Projects whitelisted for Windows SDK compilation."" 
* commit '96a4c2452e0f671abf3d66c6dfd9ac75f7105f70':
  Merge "Projects whitelisted for Windows SDK compilation."
 2012-02-14 14:54:27 -08:00
Jean-Baptiste Queru
96a4c2452e am 5539b1bf: Merge "Merge "Projects whitelisted for Windows SDK compilation."" 
* commit '5539b1bf6be817b538e9490c826151415f445081':
  Merge "Projects whitelisted for Windows SDK compilation."
 2012-02-14 14:51:40 -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
Jean-Baptiste Queru
5539b1bf6b Merge "Merge "Projects whitelisted for Windows SDK compilation."" 2012-02-14 13:02:09 -08:00
Raphael Moll
f06c958f3c Merge "Projects whitelisted for Windows SDK compilation." 
This replaces the list maintained in build/core/main.mk
There's a similar change in sdk.git at Change Ifa8111dbae

(cherry-pick of 2b53ba5897)

Change-Id: I9ea5720291c9057aab3cd4f7f590fa2f7ae17444
 2012-02-14 11:11:06 -08:00
Jean-Baptiste Queru
077e4bb882 am 44039c68: am f987c05c: am 9ce69a5f: Merge "Make sure __u64 is defined even for strict ansi or -std=c99" 
* commit '44039c689e0f117cc581c434e068436a044baa9e':
  Make sure __u64 is defined even for strict ansi or -std=c99
 2012-02-13 14:39:56 -08:00
Adam Powell
bd4ed96061 am 58589851: am 15a14930: Merge "Add AppNavigation demo" into ics-mr1 
* commit '58589851a68a3769e633f34e0fdc7c8d742f86da':
 2012-02-13 14:39:54 -08:00
Adam Powell
404be3bd4c am 1b919a3f: am 15a14930: Merge "Add AppNavigation demo" into ics-mr1 
* commit '1b919a3fb80350a6ff1857c5c3d94d86766c0555':
  Add AppNavigation demo
 2012-02-13 14:32:00 -08:00
Jean-Baptiste Queru
44039c689e am f987c05c: am 9ce69a5f: Merge "Make sure __u64 is defined even for strict ansi or -std=c99" 
* commit 'f987c05c776918d121b7e2095a232e4854fde8a8':
  Make sure __u64 is defined even for strict ansi or -std=c99
 2012-02-13 14:29:58 -08:00
Adam Powell
1b919a3fb8 am 15a14930: Merge "Add AppNavigation demo" into ics-mr1 
* commit '15a14930d761d85466faf4e5f62209e8ab078b1d':
  Add AppNavigation demo
 2012-02-13 14:29:49 -08:00
Adam Powell
58589851a6 am 15a14930: Merge "Add AppNavigation demo" into ics-mr1 
* commit '15a14930d761d85466faf4e5f62209e8ab078b1d':
  Add AppNavigation demo
 2012-02-13 14:29:19 -08:00