ADHOC/replicant-frameworks_native
3
0
Fork 0
Code Issues 7 Pull Requests Releases Wiki Activity
28,833 Commits 2 Branches 0 Tags 54 MiB
6043f96437
Commit Graph

28833 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Xavier Ducrohet
6043f96437 resolved conflicts for merge of 86e43034 to honeycomb-plus-aosp 
Change-Id: Ia9ad4c3b79821fef6ab8493f4c93ca58f877f9ce
 2011-02-24 17:19:38 -08:00
Xavier Ducrohet
c806fe1560 resolved conflicts for merge of a4350fc0 to gingerbread-plus-aosp 
Change-Id: I065af5d555fa2197847ad47c84003dcd11fe26c7
 2011-02-24 16:15:11 -08:00
Xavier Ducrohet
e90a80a73d Merge "LayoutLib: Original import of Honeycomb's layoutlib. do not merge." into gingerbread 2011-02-24 14:44:52 -08:00
Eric Fischer
adc551c073 am 1c38872f: Merge "Import revised translations. DO NOT MERGE" into honeycomb 
* commit '1c38872fd30d7b19a01cc309537e911e7f2344e9':
  Import revised translations.  DO NOT MERGE
 2011-02-24 11:18:56 -08:00
Eric Fischer
78948e6830 Merge "Import revised translations. DO NOT MERGE" into honeycomb 2011-02-24 11:15:53 -08:00
Wink Saville
2b5819058c am 0dc8618d: Do not start RILReceiver if wifi-only. 
* commit '0dc8618dc70a6aa23ea030eeda1ea9934b4a04c6':
  Do not start RILReceiver if wifi-only.
 2011-02-24 10:50:31 -08:00
repo sync
8097bccfd9 am be2ed6d6: resolved conflicts for merge of c96b6690 to gingerbread-plus-aosp 
* commit 'be2ed6d6e366d3639aecd7ef615c95f0ccf17b9d':
  DO NOT MERGE - Increasing timeout to 60 sec This was already done in HC branch in this CL: https://android-git.corp.google.com/w/?p=platform/frameworks/base.git;a=commit;h=d39fd5a97c6f56794a6ed7ac1dfb0bbf585becf1 This is also related to bug http://b/issue?id=3402863 I first considered increasing the timeout specificaly for our GData client but when I saw we already accepted a CL for HC that did this at a lower level, I decided to do that instead.
 2011-02-24 10:26:49 -08:00
repo sync
492301161b resolved conflicts for merge of c96b6690 to gingerbread-plus-aosp 
Change-Id: I1d8a026d7efe0762865d6e1a6a3fc79cbbcbd9c4
 2011-02-24 09:58:25 -08:00
Alon Albert
1f3dcff801 Merge "DO NOT MERGE - Increasing timeout to 60 sec This was already done in HC branch in this CL: https://android-git.corp.google.com/w/?p=platform/frameworks/base.git;a=commit;h=d39fd5a97c6f56794a6ed7ac1dfb0bbf585becf1 This is also related to bug http://b/issue?id=3402863 I first considered increasing the timeout specificaly for our GData client but when I saw we already accepted a CL for HC that did this at a lower level, I decided to do that instead." into gingerbread 2011-02-24 09:20:46 -08:00
Jason Chen
cba9291560 am 22577b8d: (-s ours) am 5ff79c3b: Merge "DO NOT MERGE Cherry-pick of Ie4026a7c back to GB" into gingerbread 
* commit '22577b8d3a39c1373594ba3e4427212eee4cd6d4':
  DO NOT MERGE Cherry-pick of Ie4026a7c back to GB
 2011-02-23 18:08:23 -08:00
Jason Chen
0b270d3d0e am 5ff79c3b: Merge "DO NOT MERGE Cherry-pick of Ie4026a7c back to GB" into gingerbread 
* commit '5ff79c3b06d7087153617dc973491fc890700af5':
  DO NOT MERGE Cherry-pick of Ie4026a7c back to GB
 2011-02-23 18:03:34 -08:00
Irfan Sheriff
48f8e87419 am 5107eea6: Merge "DO NOT MERGE Add support for background scanning" into honeycomb 
* commit '5107eea64e46b0fffbbbcefa469a88044f309de6':
  DO NOT MERGE Add support for background scanning
 2011-02-23 18:02:45 -08:00
Jason Chen
9281fda8e0 Merge "DO NOT MERGE Cherry-pick of Ie4026a7c back to GB" into gingerbread 2011-02-23 17:23:53 -08:00
Irfan Sheriff
fe35362c3a Merge "DO NOT MERGE Add support for background scanning" into honeycomb 2011-02-23 16:59:55 -08:00
Scott Main
05f5f4e91b am 201959af: Merge "docs: fix sensorevent code snippets bug: 3480932" into honeycomb 
* commit '201959af6e61c148576c77de6cf772456d664251':
  docs: fix sensorevent code snippets bug: 3480932
 2011-02-23 16:00:08 -08:00
Scott Main
096db9ec94 Merge "docs: fix sensorevent code snippets bug: 3480932" into honeycomb 2011-02-23 15:58:13 -08:00
Eric Fischer
d189adf1bf am 32751e31: Merge "Import revised translations. DO NOT MERGE" into honeycomb 
* commit '32751e3175d8dca96d75b6c93a32557c259c13a7':
  Import revised translations.  DO NOT MERGE
 2011-02-23 15:36:08 -08:00
Eric Fischer
5705228fb0 Merge "Import revised translations. DO NOT MERGE" into honeycomb 2011-02-23 15:33:12 -08:00
Irfan Sheriff
c0be04416a am a46a5cba: Merge "DO NOT MERGE No backup of country and sleep policy" into honeycomb 
* commit 'a46a5cba276ee269d227a5e4d69f3891c4349edf':
  DO NOT MERGE No backup of country and sleep policy
 2011-02-23 14:38:10 -08:00
Irfan Sheriff
5ebcc6f061 Merge "DO NOT MERGE No backup of country and sleep policy" into honeycomb 2011-02-23 14:35:20 -08:00
Scott Main
03caa35f6a am c516c771: docs: fix md5 sums 
* commit 'c516c7714d9cdc996053fd2a130015cbde978242':
  docs: fix md5 sums
 2011-02-23 14:17:30 -08:00
Jamie Gennis
38b95b07cf am 76d0c763: (-s ours) am fa238f03: Merge "egl: fixes for object refcounts" into gingerbread 
* commit '76d0c763f008d19791e13ebabe9ec83958354bc5':
  egl: fixes for object refcounts
 2011-02-23 13:31:12 -08:00
Jamie Gennis
a5c7de658a am fa238f03: Merge "egl: fixes for object refcounts" into gingerbread 
* commit 'fa238f033203f8e722b060af3f0095762b134f37':
  egl: fixes for object refcounts
 2011-02-23 12:46:57 -08:00
Jamie Gennis
8a5d77b8e5 Merge "egl: fixes for object refcounts" into gingerbread 2011-02-23 12:30:55 -08:00
Scott Main
43e081b357 am 2788e4f9: docs: fix some typos 
* commit '2788e4f96a3f210192145a340a1d072c70c7bc4f':
  docs: fix some typos
 2011-02-23 11:24:42 -08:00
Justin Ho
f2676bb083 am da34ab21: am 9208875e: Updated iconography for network status and adding 4G assets 
* commit 'da34ab214886531e5e9c0d975d0dc70cfe8a26a4':
  Updated iconography for network status and adding 4G assets
 2011-02-22 21:23:54 -08:00
Alon Albert
c887d5c2a8 am 1aba843d: am ccc802e1: Merge "Support quoted parameters" into gingerbread 
* commit '1aba843dc327490a749059bcddff90e8048ed75c':
  Support quoted parameters
 2011-02-22 21:23:50 -08:00
Justin Ho
3c48c35ec7 am 9208875e: Updated iconography for network status and adding 4G assets 
* commit '9208875e92ec190d49864b92823dd7011b9b443a':
  Updated iconography for network status and adding 4G assets
 2011-02-22 21:19:05 -08:00
Alon Albert
9427552e6a am ccc802e1: Merge "Support quoted parameters" into gingerbread 
* commit 'ccc802e12be64248c2c6822eb36a957435a06ef2':
  Support quoted parameters
 2011-02-22 21:18:52 -08:00
Robert Ly
73a8ca392f am c6c6fe93: Merge "doc change: fix missing code ending tag" into honeycomb 
* commit 'c6c6fe939c83e644b7626f6d3f3be25883af1583':
  doc change: fix missing code ending tag
 2011-02-22 21:15:28 -08:00
Scott Main
790827feca am 47928f89: Merge "docs: fix broken links" into honeycomb 
* commit '47928f898d81625cb1e66eea9eb6120f719e89ee':
  docs: fix broken links
 2011-02-22 21:15:23 -08:00
James Dong
2b389b53e8 am 6c9b500f: Merge "Added more warnings in javadoc for failure to call MediaPlayer.release() immediately if a MediaPlayer is not needed" into honeycomb 
* commit '6c9b500fc59edd8cb3b5a9ac4a0ddadf54bdf525':
  Added more warnings in javadoc for failure to call MediaPlayer.release() immediately if a MediaPlayer is not needed
 2011-02-22 21:15:19 -08:00
Scott Main
c331cf3a53 am 0ea4f0d7: Merge "docs: update highlights doc to remove preview" into honeycomb 
* commit '0ea4f0d79126e953a87604162c1b9a9e91ffbb1f':
  docs: update highlights doc to remove preview
 2011-02-22 21:15:15 -08:00
Scott Main
2c3211a8b9 am 9d5f35d9: Merge "docs: add breadcrumb trails to some docs, mostly manifest docs" into honeycomb 
* commit '9d5f35d9e0e406bd9e109879db890e361e137929':
  docs: add breadcrumb trails to some docs, mostly manifest docs
 2011-02-22 21:15:09 -08:00
Roman Nurik
56096b72be am cba8efdf: Add more tags to the RenderScript sample listing. 
* commit 'cba8efdff8a77b159f259d973b05d508a61206e1':
  Add more tags to the RenderScript sample listing.
 2011-02-22 21:15:03 -08:00
Dirk Dougherty
075fb8d45d am 7036d76a: Merge "Doc change: Add doc for GL texture declaration/filtering, hardwareAccelerated manifest attr." into honeycomb 
* commit '7036d76a6e172de300c63cb9c33b65a63fe7ce0f':
  Doc change: Add doc for GL texture declaration/filtering, hardwareAccelerated manifest attr.
 2011-02-22 21:14:58 -08:00
Roman Nurik
456d1a9e00 am 4f4cab75: Merge "Document support for WebM/VP8 decoding." into honeycomb 
* commit '4f4cab75cc0dff361d181299f07a233e8bb1e1c0':
  Document support for WebM/VP8 decoding.
 2011-02-22 21:14:52 -08:00
Nick Pelly
5c3de225bc am beb01c93: Merge "DO NOT MERGE." into honeycomb 
* commit 'beb01c93f9bed3dd36fc8ee63a8a7ab8d6ec9c70':
  DO NOT MERGE.
 2011-02-22 21:14:46 -08:00
Scott Main
6dbf9ee57b am 4d62ef25: docs: revert ndk r6 
* commit '4d62ef259568a050e0103a9beff702f0edd03f61':
  docs: revert ndk r6
 2011-02-22 21:14:40 -08:00
Scott Main
f3ae0bd682 am f870c5af: docs: add new-child tags to hide the "new" tag when a parent list item is expanded 
* commit 'f870c5af7ac45d1c865bb2de5696f45c24ac396d':
  docs: add new-child tags to hide the "new" tag when a parent list item is expanded
 2011-02-22 21:14:34 -08:00
Scott Main
c84bd4c4f5 am 1f694390: docs: move 3.0 optimizing doc into the dev guide 
* commit '1f694390225b462f76d580fb150fb0a07585df48':
  docs: move 3.0 optimizing doc into the dev guide
 2011-02-22 21:14:15 -08:00
Michael I. Gold
3e52713ffd egl: fixes for object refcounts 
eglMakeCurrent() would only deref the previous surfaces if the old and
new contexts were the same.  eglTerminate() should not touch TLS.
eglReleaseThread() needs to unbind the current context.

Change-Id: I7f4c090a287ee1e29e4708ae10679fb9d7d8c8c5
Related-Bug: 2964479
 2011-02-22 18:15:08 -08:00
Robert Ly
8a53f66ac7 Merge "doc change: fix missing code ending tag" into honeycomb 2011-02-22 16:57:06 -08:00
Scott Main
1287cd2dc5 Merge "docs: fix broken links" into honeycomb 2011-02-22 16:49:32 -08:00
James Dong
14b4aa8855 Merge "Added more warnings in javadoc for failure to call MediaPlayer.release() immediately if a MediaPlayer is not needed" into honeycomb 2011-02-22 16:41:29 -08:00
Scott Main
bc20a560ca Merge "docs: update highlights doc to remove preview" into honeycomb 2011-02-22 15:36:31 -08:00
Scott Main
acc6b035bd Merge "docs: add breadcrumb trails to some docs, mostly manifest docs" into honeycomb 2011-02-22 15:14:39 -08:00
Maarten Hooft
6030f4e0ed am 62f40c8b: (-s ours) am 99cca89f: Merge "Import revised translations. DO NOT MERGE" into gingerbread 
* commit '62f40c8bcf78ac872a01aee8840b808b5aeea1d8':
  Import revised translations.  DO NOT MERGE
 2011-02-22 14:48:40 -08:00
Romain Guy
586b7f4690 am ad492161: am a2090bea: am 7118bdec: Merge "Fix for #12945: ProgressBar.setMax() will always redraw." 
* commit 'ad492161e4384efe11daec60cd14902f6b2c662a':
  Fix for #12945: ProgressBar.setMax() will always redraw.
 2011-02-22 14:48:21 -08:00
Dirk Dougherty
809780b260 Merge "Doc change: Add doc for GL texture declaration/filtering, hardwareAccelerated manifest attr." into honeycomb 2011-02-22 12:47:25 -08:00