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

8448 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
8bd39ae17c Merge "EmuGL: GLESv2 support for OES_EGL_image_external" into ics-mr1 2012-02-24 12:06:20 -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
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
Jesse Hall
d6bd1843ce EmuGL: GLESv2 support for OES_EGL_image_external 
Change-Id: I8911328d5dcccdf4731bd2d8fd953c12fdec5f1b
 2012-02-22 15:03:30 -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
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
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
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
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
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
b6f947238f Reconcile with ics-mr1-release 
Change-Id: I846571d58584c9f58a20e8c9d1b144a93801c834
 2012-02-16 10:14:42 -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
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
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
58589851a6 am 15a14930: Merge "Add AppNavigation demo" into ics-mr1 
* commit '15a14930d761d85466faf4e5f62209e8ab078b1d':
  Add AppNavigation demo
 2012-02-13 14:29:19 -08:00
Adam Powell
15a14930d7 Merge "Add AppNavigation demo" into ics-mr1 2012-02-13 14:27:58 -08:00
Jean-Baptiste Queru
f987c05c77 am 9ce69a5f: Merge "Make sure __u64 is defined even for strict ansi or -std=c99" 
* commit '9ce69a5f9fc1e5e4efb19b708c9aa91cfd0969db':
  Make sure __u64 is defined even for strict ansi or -std=c99
 2012-02-13 14:27:33 -08:00
Jean-Baptiste Queru
9ce69a5f9f Merge "Make sure __u64 is defined even for strict ansi or -std=c99" 2012-02-13 14:24:04 -08:00
Scott Main
e4fd504325 am de797a2f: Merge "docs: fix minsdkversion for native activity sample" into ics-mr1 
* commit 'de797a2fb233ce1aed1eedb9cfc629ba63bd9bd7':
  docs: fix minsdkversion for native activity sample
 2012-02-09 12:16:42 -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
1276f7ba04 am 0e981c83: EmuGL: Fix heap corruption 
* commit '0e981c83041878e6a05b0a996879160fd0f320cf':
  EmuGL: Fix heap corruption
 2012-02-06 13:36:19 -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
7b8f2c59cd am 47365074: Merge "Adding Android Developers Google+ redirect" into ics-mr1 
* commit '47365074a01acc1826e10cf530f613e4cd58d62a':
  Adding Android Developers Google+ redirect
 2012-02-03 13:10:20 -08:00
Trevor Johns
87f81a89f4 am 7a94a9dc: Merge "Adding manual redirect support to developer.android.com." into ics-mr1 
* commit '7a94a9dc49fc9b512e30fc5737baed8d1ddc7d13':
  Adding manual redirect support to developer.android.com.
 2012-02-03 13:10:20 -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
c90d4c8a09 am df458cb8: Fix api version file with proper data enum. 
* commit 'df458cb83274782a7908333ae2f21a1860a12400':
  Fix api version file with proper data enum.
 2012-02-01 13:47:16 -08:00
The Android Open Source Project
9114b85e63 Reconcile with ics-mr1-release 
Change-Id: I9edbfba9b4c69b550b60723b903bae30580a149b
 2012-02-01 08:42:39 -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
ae8a60985b am e11b2d6c: Update api version file with stripped generics info. 
* commit 'e11b2d6c9f479528092a56bfe94054798e3e4831':
  Update api version file with stripped generics info.
 2012-01-31 15:49:41 -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 Open Source Project
068436ed63 Reconcile with ics-mr1-release 
Change-Id: Ibff0a60a4654253950e08e68cafddfe7c9219734
 2012-01-30 13:36:26 -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
cafd05f0c9 am 97d0a1db: Merge "Fix bug in the new notification sample." into ics-mr1 
* commit '97d0a1db24c5c46089e5fa6c18b0fb1a49140125':
  Fix bug in the new notification sample.
 2012-01-30 12:56:10 -08:00
Dianne Hackborn
97d0a1db24 Merge "Fix bug in the new notification sample." into ics-mr1 2012-01-30 12:52:26 -08:00