LineageOS/android_development
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
9,306 Commits 2 Branches 0 Tags
08d643e5eb13e24d76c227a34119415bd347c46c
Commit Graph

9306 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
3093ef07a2 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:29 -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
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
31c861e240 am 00e61338: EmuGL: refinements to GLESv1 image_external 
* commit '00e61338b8374de090e81537047846ca06f88280':
  EmuGL: refinements to GLESv1 image_external
 2012-02-22 13:45:50 -08:00
Jesse Hall
7211b5ebe0 am ac018fe3: EmuGL: refcount ColorBuffers on the host 
* commit 'ac018fe3f65e18083a2dd317f73e4139bfa5fee6':
  EmuGL: refcount ColorBuffers on the host
 2012-02-22 13:45:49 -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
Brett Chabot
860d73c398 Merge "Fix runtest local.prop handling." 2012-02-22 12:43:18 -08:00
Jason Sams
64ee2e44ef Merge "Use IO stream" 2012-02-22 12:11:12 -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
0c50150766 am 91d4e8e1: GLESv2 translator: don\'t delete EGLImage textures 
* commit '91d4e8e195592dbc812441597118452f887ea07d':
  GLESv2 translator: don't delete EGLImage textures
 2012-02-22 10:10:43 -08:00
Siva Velusamy
e7cb1c37e8 Merge "glesv2debugger: Remove obsolete files." 2012-02-22 10:10:11 -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
Siva Velusamy
88a2bd65da glesv2debugger: Remove obsolete files. 
The new version of gl debugger is located at:
sdk/eclipse/plugins/com.android.ide.eclipse.gldebugger

Change-Id: I274be9ab34b9da9d7b9d7e00c2d53dcbeab4b15a
 2012-02-21 09:41:14 -08:00
Brett Chabot
25dfd79b2e Fix runtest local.prop handling. 
Change-Id: Iec8d942fc11d46bdd54f55485aedb4b0021afee3
 2012-02-17 15:58:01 -08:00
Raphael Moll
f2f798d213 Merge "SDK: Support generating XML with new name/vendor attributes." 2012-02-17 14:04:28 -08:00
Jason Noguchi
91f836cc48 Merge "Adding the mock camera activity test to continuous test." 2012-02-17 13:53:05 -08:00
Romain Guy
3b2807bfaa Merge "Remove the GlobalTime sample app." 2012-02-17 13:12:41 -08:00
Romain Guy
3c4c9f87ef Remove the GlobalTime sample app. 
GlobalTime relied on obsolete private APIs.

Change-Id: I338f3f2021ba8a708056c10e3cce71307a529ea9
 2012-02-17 13:07:18 -08:00
Raphael Moll
b4ce1c006d SDK: Support generating XML with new name/vendor attributes. 
Change-Id: I21f371879660d5b590a212fd81754fc5f128e428
 2012-02-17 09:18:50 -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