ADHOC/replicant-frameworks_native
3
0
Fork 0
Code Issues 7 Pull Requests Releases Wiki Activity
21,646 Commits 2 Branches 0 Tags 54 MiB
d6d93dbb86
Commit Graph

21646 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Patrick Scott
0def8121aa am acb79542: (-s ours) am b2044da3: Do not merge: cherry-pick a fix for a npe. 
Merge commit 'acb795424b1e0b73fbdb69c8a93892d05f5689da'

* commit 'acb795424b1e0b73fbdb69c8a93892d05f5689da':
  Do not merge: cherry-pick a fix for a npe.
 2010-09-22 07:18:49 -07:00
Patrick Scott
0b75398771 am b2044da3: Do not merge: cherry-pick a fix for a npe. 
Merge commit 'b2044da3f9f9ad74f0dffd5ae024e558f8a9a89a' into gingerbread-plus-aosp

* commit 'b2044da3f9f9ad74f0dffd5ae024e558f8a9a89a':
  Do not merge: cherry-pick a fix for a npe.
 2010-09-22 07:03:12 -07:00
Dianne Hackborn
f42d6398b7 Merge "Work on fragments in layouts." 2010-09-21 22:17:52 -07:00
Shin-ichiro Fukuda
43374b8e73 am 5144594c: (-s ours) am dd62a056: DO NOT MERGE. MOTOYA Japanese fonts 
Merge commit '5144594cc1e945eaf58b6ed66d26d7a1b7985afc'

* commit '5144594cc1e945eaf58b6ed66d26d7a1b7985afc':
  DO NOT MERGE. MOTOYA Japanese fonts
 2010-09-21 20:21:48 -07:00
Raphael Moll
d0c74812f5 am 98699c8f: am f2960b8d: Refresh the layoutlib_create doc. 
Merge commit '98699c8fc44358d168183dae47e10758b2d1cb08'

* commit '98699c8fc44358d168183dae47e10758b2d1cb08':
  Refresh the layoutlib_create doc.
 2010-09-21 20:21:43 -07:00
Jeff Brown
b685bf4409 am 77d9a5a5: am 98bcb41d: Merge "Fix race reading input configuration during system startup." into gingerbread 
Merge commit '77d9a5a55fa52074f18012cf997854a82500fd59'

* commit '77d9a5a55fa52074f18012cf997854a82500fd59':
  Fix race reading input configuration during system startup.
 2010-09-21 20:21:27 -07:00
Shin-ichiro Fukuda
90ffd1462d am dd62a056: DO NOT MERGE. MOTOYA Japanese fonts 
Merge commit 'dd62a056b8d746c620218a68bb476382f02d8174' into gingerbread-plus-aosp

* commit 'dd62a056b8d746c620218a68bb476382f02d8174':
  DO NOT MERGE. MOTOYA Japanese fonts
 2010-09-21 19:35:35 -07:00
Raphael Moll
487fbba5e9 am f2960b8d: Refresh the layoutlib_create doc. 
Merge commit 'f2960b8d66d7a20f590716f5e51160e77d0d1b24' into gingerbread-plus-aosp

* commit 'f2960b8d66d7a20f590716f5e51160e77d0d1b24':
  Refresh the layoutlib_create doc.
 2010-09-21 18:58:14 -07:00
Jeff Brown
810ba3f321 am 98bcb41d: Merge "Fix race reading input configuration during system startup." into gingerbread 
Merge commit '98bcb41d9b434bbe486b33681d9d091d6072d1f1' into gingerbread-plus-aosp

* commit '98bcb41d9b434bbe486b33681d9d091d6072d1f1':
  Fix race reading input configuration during system startup.
 2010-09-21 18:39:39 -07:00
Jeff Brown
452598cc1e Merge "Fix race reading input configuration during system startup." into gingerbread 2010-09-21 18:33:12 -07:00
Adam Powell
bc0c0121af am 770a681b: (-s ours) am 9aed3002: Text selection anchors changed to use windows 
Merge commit '770a681b2f5b00e699920317bff04a24676ae143'

* commit '770a681b2f5b00e699920317bff04a24676ae143':
  Text selection anchors changed to use windows
 2010-09-21 18:32:54 -07:00
Stephen Hines
40d3f65f4b Merge "Test use of "f" suffix on float initializers." 2010-09-21 18:28:02 -07:00
Adam Powell
9176872e71 Merge "Text selection anchors changed to use windows" 2010-09-21 18:10:12 -07:00
Dan Morrill
816a4684ad am 596b55d9: am 62018429: Merge "Adding new feature definitions for new sensors (barometer and gyroscope.)" into gingerbread 
Merge commit '596b55d9c82a52049702931839f69a12cd7dc920'

* commit '596b55d9c82a52049702931839f69a12cd7dc920':
  Adding new feature definitions for new sensors (barometer and gyroscope.)
 2010-09-21 17:45:33 -07:00
Brett Chabot
faac317626 am b255560b: Merge "Fix build" into gingerbread-plus-aosp 
Merge commit 'b255560b35f8d776a71a9e8adb127e17c704466e'

* commit 'b255560b35f8d776a71a9e8adb127e17c704466e':
  Fix build
 2010-09-21 17:41:08 -07:00
Adam Powell
dbdd60b9d7 am 9aed3002: Text selection anchors changed to use windows 
Merge commit '9aed300279db6953356aed5ef24a42291f5829cb' into gingerbread-plus-aosp

* commit '9aed300279db6953356aed5ef24a42291f5829cb':
  Text selection anchors changed to use windows
 2010-09-21 17:20:40 -07:00
Dan Morrill
212b858725 am 62018429: Merge "Adding new feature definitions for new sensors (barometer and gyroscope.)" into gingerbread 
Merge commit '62018429c2639b8a0f27e9b18b9b186df80bca4d' into gingerbread-plus-aosp

* commit '62018429c2639b8a0f27e9b18b9b186df80bca4d':
  Adding new feature definitions for new sensors (barometer and gyroscope.)
 2010-09-21 17:03:42 -07:00
Dan Morrill
01d038ae02 Merge "Adding new feature definitions for new sensors (barometer and gyroscope.)" into gingerbread 2010-09-21 16:59:29 -07:00
Eric Laurent
ce2d895ad2 am 6943b94b: am a6dc4699: Merge "Fix issue 2913071." into gingerbread 
Merge commit '6943b94b8f267c83060946bae0961efc30444dee'

* commit '6943b94b8f267c83060946bae0961efc30444dee':
  Fix issue 2913071.
 2010-09-21 16:53:20 -07:00
Romain Guy
3c6baac4d3 Merge "Add support for circular gradients to the GL renderer." 2010-09-21 16:50:50 -07:00
Jeff Brown
422ef517fa Merge "resolved conflicts for merge of aa522ac8 to master" 2010-09-21 16:47:04 -07:00
Jeff Brown
9efdba3c3d resolved conflicts for merge of aa522ac8 to master 
Change-Id: Ib17ff201e770abc6b9edb58e01f3bb483dc8fa56
 2010-09-21 16:45:16 -07:00
Mathias Agopian
a93b957e8e fix typo EGL_NO_IMAGE_KHR -> EGL_NO_SYNC_KHR 
Change-Id: I38c87803e32030918f2deb06381eabce0faa870c
 2010-09-21 16:22:10 -07:00
Brett Chabot
a656cb17c2 Merge "Fix build" into gingerbread-plus-aosp 2010-09-21 16:06:58 -07:00
Eric Laurent
3d64b57049 am a6dc4699: Merge "Fix issue 2913071." into gingerbread 
Merge commit 'a6dc4699222a484222d1c54d5319f302a02e406b' into gingerbread-plus-aosp

* commit 'a6dc4699222a484222d1c54d5319f302a02e406b':
  Fix issue 2913071.
 2010-09-21 15:59:23 -07:00
Jeff Brown
f0984ec8fc am ed739327: Simplify and optimize MessageQueue loop. 
Merge commit 'ed7393274af2f268fcdede5f1a3d72c9af842b8e' into gingerbread-plus-aosp

* commit 'ed7393274af2f268fcdede5f1a3d72c9af842b8e':
  Simplify and optimize MessageQueue loop.
 2010-09-21 15:59:14 -07:00
Jeff Brown
6bea174983 am 4ec134cd: am cce0cd13: Merge "Looper: use pthread_once for TLS key initialization." into gingerbread 
Merge commit '4ec134cdba52b663506562c6406b07915820b007'

* commit '4ec134cdba52b663506562c6406b07915820b007':
  Looper: use pthread_once for TLS key initialization.
 2010-09-21 15:57:13 -07:00
Eric Laurent
f5d7bad76a Merge "Fix issue 2913071." into gingerbread 2010-09-21 15:55:17 -07:00
Jeff Brown
0a2f370441 am cce0cd13: Merge "Looper: use pthread_once for TLS key initialization." into gingerbread 
Merge commit 'cce0cd138dd0dc338db59083052aca01a51bd52d' into gingerbread-plus-aosp

* commit 'cce0cd138dd0dc338db59083052aca01a51bd52d':
  Looper: use pthread_once for TLS key initialization.
 2010-09-21 15:52:09 -07:00
Mathias Agopian
02dafb5068 fix small bug in EGL error management 
make sure to clear our EGL implementation's error when returning
an error from an underlying implementation

Change-Id: Ibce4726cef1f900e4c7f16002345d7a07f8cdf41
 2010-09-21 15:43:59 -07:00
Jason Sams
8b0b2a6ce7 Merge "Detect and throw exception for using objects after explicitly destroying them." 2010-09-21 15:43:30 -07:00
Jeff Brown
02a5e339d0 Merge "Looper: use pthread_once for TLS key initialization." into gingerbread 2010-09-21 15:36:06 -07:00
Jeff Brown
61a25b2490 Looper: use pthread_once for TLS key initialization. 
Also fix a Valgrind complaint by zeroing out the entire epoll event
struct since otherwise the data field union would be partly
uninitialized (but not in a harmful way).

Change-Id: I2091ce517e87fcad7c9caf90e2c5e4854a7ca465
 2010-09-21 15:26:51 -07:00
Andreas Huber
66bb9da7c1 am 0b2affe8: am 87d208f7: Merge "This log message is codec specific." into gingerbread 
Merge commit '0b2affe8f05f887fcb6ae6314e2a0e586dabe9e1'

* commit '0b2affe8f05f887fcb6ae6314e2a0e586dabe9e1':
  This log message is codec specific.
 2010-09-21 15:25:42 -07:00
Andreas Huber
73da2d8b4c am af909581: am 67738486: Merge "Remove stagefright foundation\'s incompatible logging interface and update callsites." into gingerbread 
Merge commit 'af90958184fc5cfa1a4190e28bcfc4fdd4a5bcd6'

* commit 'af90958184fc5cfa1a4190e28bcfc4fdd4a5bcd6':
  Remove stagefright foundation's incompatible logging interface and update callsites.
 2010-09-21 15:22:00 -07:00
Andreas Huber
2160280c6a am 87d208f7: Merge "This log message is codec specific." into gingerbread 
Merge commit '87d208f7ea7d8fc518d1403aae6d1ba1833bff13' into gingerbread-plus-aosp

* commit '87d208f7ea7d8fc518d1403aae6d1ba1833bff13':
  This log message is codec specific.
 2010-09-21 15:20:38 -07:00
Andreas Huber
afe2f60367 am 67738486: Merge "Remove stagefright foundation\'s incompatible logging interface and update callsites." into gingerbread 
Merge commit '67738486d9d1bdc2e6fb0c04698fd74de689acbc' into gingerbread-plus-aosp

* commit '67738486d9d1bdc2e6fb0c04698fd74de689acbc':
  Remove stagefright foundation's incompatible logging interface and update callsites.
 2010-09-21 15:17:42 -07:00
Andreas Huber
8d6044a885 Merge "This log message is codec specific." into gingerbread 2010-09-21 15:17:04 -07:00
Andreas Huber
2604c0ad95 Merge "Remove stagefright foundation's incompatible logging interface and update callsites." into gingerbread 2010-09-21 15:14:43 -07:00
Kenny Root
1682938dbe am c1558df7: am 34d3aeaf: Merge "Add image creator helper script for OBBs" into gingerbread 
Merge commit 'c1558df7778ec5bf9be5ecee9395d4684b6948e2'

* commit 'c1558df7778ec5bf9be5ecee9395d4684b6948e2':
  Add image creator helper script for OBBs
 2010-09-21 15:11:09 -07:00
Steve Howard
d738e057b9 am 8bf158f6: am 34a7f080: Merge "Un-@hide ability to download without a running notification." into gingerbread 
Merge commit '8bf158f6ba31efd2f262fc3ba6cdd13733c7d99e'

* commit '8bf158f6ba31efd2f262fc3ba6cdd13733c7d99e':
  Un-@hide ability to download without a running notification.
 2010-09-21 15:07:15 -07:00
Kenny Root
4587031a5a am 34d3aeaf: Merge "Add image creator helper script for OBBs" into gingerbread 
Merge commit '34d3aeaf7f5dd744f46220f7730913468256ae9c' into gingerbread-plus-aosp

* commit '34d3aeaf7f5dd744f46220f7730913468256ae9c':
  Add image creator helper script for OBBs
 2010-09-21 15:06:08 -07:00
Steve Howard
de6ccb9205 am 34a7f080: Merge "Un-@hide ability to download without a running notification." into gingerbread 
Merge commit '34a7f0807ee93eaefe83a9192ebc774fb1560875' into gingerbread-plus-aosp

* commit '34a7f0807ee93eaefe83a9192ebc774fb1560875':
  Un-@hide ability to download without a running notification.
 2010-09-21 15:02:53 -07:00
Kenny Root
efed55f569 Merge "Add image creator helper script for OBBs" into gingerbread 2010-09-21 15:00:30 -07:00
Steve Howard
e29bba3165 Merge "Un-@hide ability to download without a running notification." into gingerbread 2010-09-21 14:58:05 -07:00
Wink Saville
21b7244c69 Merge "Cleanup copyright dates add missing method." 2010-09-21 14:55:16 -07:00
Amith Yamasani
cfd3989bcf Merge "Make the breadcrumbs touchable for navigation." 2010-09-21 14:51:03 -07:00
Adam Powell
0aef4a1889 am f38c7e75: am 1e646b55: Merge "Add mdpi text select anchor asset" into gingerbread 
Merge commit 'f38c7e7531de2c3084fcf302d53e4544a4c1561d'

* commit 'f38c7e7531de2c3084fcf302d53e4544a4c1561d':
  Add mdpi text select anchor asset
 2010-09-21 14:43:16 -07:00
Mindy Pereira
1cb8dcec84 am 447c677e: (-s ours) am 1139b326: Merge "DO NOT MERGE Tweaked EdgeGlow to better match user expectations." into gingerbread 
Merge commit '447c677e97e90344881371ecef1ec8aca1b3acc0'

* commit '447c677e97e90344881371ecef1ec8aca1b3acc0':
  DO NOT MERGE Tweaked EdgeGlow to better match user expectations.
 2010-09-21 14:43:06 -07:00
Vasu Nori
b4d9e63a57 Merge "bring database code in master for 'adb bugreport' in sync with ginger" 2010-09-21 14:39:44 -07:00