ADHOC/replicant-frameworks_native
3
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
17,327 Commits 2 Branches 0 Tags 54 MiB
c9fe8110e0
Commit Graph

17327 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Jean-Baptiste Queru
c9fe8110e0 resolved conflicts for merge of bcbb5845 to gingerbread-plus-aosp 
Change-Id: I04fb94c91958bcba3e587a8bf523c551d964f761
 2010-08-17 07:41:59 -07:00
Mike Lockwood
7eea57b675 am b6ef8bad: Merge "GPS: Initialize XTRA support when GPS is enabled" into gingerbread 
Merge commit 'b6ef8bad8a48fdc28770cf34d0c9efefc7fdd815' into gingerbread-plus-aosp

* commit 'b6ef8bad8a48fdc28770cf34d0c9efefc7fdd815':
  GPS: Initialize XTRA support when GPS is enabled
 2010-08-17 04:49:52 -07:00
Mike Lockwood
6cc135ee95 Merge "GPS: Initialize XTRA support when GPS is enabled" into gingerbread 2010-08-17 04:46:29 -07:00
Joseph Wen
9a24262b6c am f1f48bc7: Do JPEG tile-based decoding. 
Merge commit 'f1f48bc7f200f54c76b22d845d8ba8419879b375' into gingerbread-plus-aosp

* commit 'f1f48bc7f200f54c76b22d845d8ba8419879b375':
  Do JPEG tile-based decoding.
 2010-08-17 00:31:34 -07:00
Jeff Brown
ecb4faaffa am 1ce4394c: Merge "Throttle userActivity calls from input dispatcher." into gingerbread 
Merge commit '1ce4394c779be5e67e37bbb995da13865b36c573' into gingerbread-plus-aosp

* commit '1ce4394c779be5e67e37bbb995da13865b36c573':
  Throttle userActivity calls from input dispatcher.
 2010-08-16 20:00:29 -07:00
Jeff Brown
99dd374036 Merge "Throttle userActivity calls from input dispatcher." into gingerbread 2010-08-16 19:59:03 -07:00
Mathias Agopian
c695431372 am 833533c9: Improve Display javadoc slightly 
Merge commit '833533c9292f860e4dfc060a4eba6429cd259ed4' into gingerbread-plus-aosp

* commit '833533c9292f860e4dfc060a4eba6429cd259ed4':
  Improve Display javadoc slightly
 2010-08-16 16:54:49 -07:00
Daniel Sandler
fffc7dd605 am 80810f86: Merge "Fix crash in status bar ticker." into gingerbread 
Merge commit '80810f86e93866674f3a4ca61f84887e7717aa63' into gingerbread-plus-aosp

* commit '80810f86e93866674f3a4ca61f84887e7717aa63':
  Fix crash in status bar ticker.
 2010-08-16 13:20:19 -07:00
James Dong
c6d0941373 am eff30e3d: Change the default time scale for audio/video track during recording and reduce rounding errors in calculating the sample duration 
Merge commit 'eff30e3d1b005fd0696390d1dd47ec4ff0c52784' into gingerbread-plus-aosp

* commit 'eff30e3d1b005fd0696390d1dd47ec4ff0c52784':
  Change the default time scale for audio/video track during recording
 2010-08-16 13:20:15 -07:00
Doug Zongker
4e4c7a5fd9 am 997dc32b: Merge "add an api for getting a device serial number" into gingerbread 
Merge commit '997dc32b6bef1c9cc8ac6d4d598698507b2c4934' into gingerbread-plus-aosp

* commit '997dc32b6bef1c9cc8ac6d4d598698507b2c4934':
  add an api for getting a device serial number
 2010-08-16 13:20:05 -07:00
Daniel Sandler
e999003f69 Merge "Fix crash in status bar ticker." into gingerbread 2010-08-16 12:22:29 -07:00
Doug Zongker
20b1675614 Merge "add an api for getting a device serial number" into gingerbread 2010-08-16 09:19:40 -07:00
Jean-Baptiste Queru
e02856c0f9 Merge "frameworks/base/opengl: Add NULL check" 2010-08-16 08:57:29 -07:00
Chung-yih Wang
6160b7b827 am cfd15dd3: Fix the IN_CALL mode issue. 
Merge commit 'cfd15dd3c8554cbbcb5822a0fdf6ca31d6b28acf' into gingerbread-plus-aosp

* commit 'cfd15dd3c8554cbbcb5822a0fdf6ca31d6b28acf':
  Fix the IN_CALL mode issue.
 2010-08-16 03:26:41 -07:00
Dianne Hackborn
8f3fcfede7 am 567722ee: Merge "Fix problems with determining when to kill apps for wake usage." into gingerbread 
Merge commit '567722eee190f7cf88dc7ea95167db76d5514842' into gingerbread-plus-aosp

* commit '567722eee190f7cf88dc7ea95167db76d5514842':
  Fix problems with determining when to kill apps for wake usage.
 2010-08-15 17:34:49 -07:00
Dianne Hackborn
9521327aa2 Merge "Fix problems with determining when to kill apps for wake usage." into gingerbread 2010-08-15 17:33:02 -07:00
Irfan Sheriff
5dada33b78 am f76a05e9: Merge "DO NOT MERGE Fix wifi status icon" into gingerbread 
Merge commit 'f76a05e985c249f2540eb8925f673b5c63b9566b' into gingerbread-plus-aosp

* commit 'f76a05e985c249f2540eb8925f673b5c63b9566b':
  DO NOT MERGE Fix wifi status icon
 2010-08-15 16:04:24 -07:00
Irfan Sheriff
a3c918d9e5 Merge "DO NOT MERGE Fix wifi status icon" into gingerbread 2010-08-15 15:57:47 -07:00
James Dong
e83bc2e31f am b7208196: Use audio clock as the reference media clock 
Merge commit 'b72081966da3842e27f88045cfa5a67cef3d4220' into gingerbread-plus-aosp

* commit 'b72081966da3842e27f88045cfa5a67cef3d4220':
  Use audio clock as the reference media clock
 2010-08-13 18:28:52 -07:00
Mathias Agopian
3c7a766c66 am 6a73368b: Merge "fix a typo that prevented glTexImage2D codepath to work" into gingerbread 
Merge commit '6a73368be44f45a80cc4b65dc57b9ff529cb2d89' into gingerbread-plus-aosp

* commit '6a73368be44f45a80cc4b65dc57b9ff529cb2d89':
  fix a typo that prevented glTexImage2D codepath to work
 2010-08-13 16:32:43 -07:00
Mathias Agopian
998831fbc3 Merge "fix a typo that prevented glTexImage2D codepath to work" into gingerbread 2010-08-13 16:29:48 -07:00
Mathias Agopian
f1c468e481 fix a typo that prevented glTexImage2D codepath to work 
Change-Id: I36a3bf9d1d2eacd9b14e00b0a6c53bf88bba381c
 2010-08-13 16:25:13 -07:00
Robert Greenwalt
83f7036f2a am e300b8c1: Merge "DO NOT MERGE Always set/remove default routes." into gingerbread 
Merge commit 'e300b8c10c306b575bbbec29d5572ba92a97785e' into gingerbread-plus-aosp

* commit 'e300b8c10c306b575bbbec29d5572ba92a97785e':
  DO NOT MERGE Always set/remove default routes.
 2010-08-13 16:03:29 -07:00
Dianne Hackborn
8518f2bafd am a8d9291d: Merge "Various battery info things:" into gingerbread 
Merge commit 'a8d9291d7f93d1aa0d24d71d65c7de2894812177' into gingerbread-plus-aosp

* commit 'a8d9291d7f93d1aa0d24d71d65c7de2894812177':
  Various battery info things:
 2010-08-13 16:00:44 -07:00
Robert Greenwalt
f8d7290f08 Merge "DO NOT MERGE Always set/remove default routes." into gingerbread 2010-08-13 15:59:53 -07:00
Dianne Hackborn
cdaaf337e0 Merge "Various battery info things:" into gingerbread 2010-08-13 15:56:29 -07:00
Ying Wang
8fc042cfd8 am e05184f2: Merge "Output proguard keep flags for fragment classes." into gingerbread 
Merge commit 'e05184f271f9882a5bf828e353aea40e0c06ff69' into gingerbread-plus-aosp

* commit 'e05184f271f9882a5bf828e353aea40e0c06ff69':
  Output proguard keep flags for fragment classes.
 2010-08-13 15:29:04 -07:00
Ying Wang
d5e43c2f3e Merge "Output proguard keep flags for fragment classes." into gingerbread 2010-08-13 15:26:21 -07:00
Jake Hamby
cc2ab10481 am 3f442ece: Merge "Fix character count bug and Javadoc typos in SMS (with test cases)" into gingerbread 
Merge commit '3f442ece257d416b48f7803a4cc263f0215faa0d' into gingerbread-plus-aosp

* commit '3f442ece257d416b48f7803a4cc263f0215faa0d':
  Fix character count bug and Javadoc typos in SMS (with test cases)
 2010-08-13 15:19:11 -07:00
Jake Hamby
c55241999c Merge "Fix character count bug and Javadoc typos in SMS (with test cases)" into gingerbread 2010-08-13 15:15:36 -07:00
Eric Fischer
2afb8eec2f am 244152bf: Merge "Change aapt\'s warning message to suggest formatted="false", not "true"." into gingerbread 
Merge commit '244152bfb9020341953d3e541c85eb3961806378' into gingerbread-plus-aosp

* commit '244152bfb9020341953d3e541c85eb3961806378':
  Change aapt's warning message to suggest formatted="false", not "true".
 2010-08-13 14:56:47 -07:00
Eric Fischer
d507574d25 Merge "Change aapt's warning message to suggest formatted="false", not "true"." into gingerbread 2010-08-13 14:54:15 -07:00
Jake Hamby
0adbfde3ce am 4f170821: Merge "Fix typo and bug in CTS test class." into gingerbread 
Merge commit '4f170821678099010ec593d2b5a081e0f8adf92d' into gingerbread-plus-aosp

* commit '4f170821678099010ec593d2b5a081e0f8adf92d':
  Fix typo and bug in CTS test class.
 2010-08-13 14:53:03 -07:00
Jake Hamby
9bdf2b0bc1 Merge "Fix typo and bug in CTS test class." into gingerbread 2010-08-13 14:51:09 -07:00
Ficus Kirkpatrick
b8dff72c9c am 0a6bfe2a: am 2abde6e0: Add --max-res-version flag to aapt. 
Merge commit '0a6bfe2ae21f19adf65d8b8a18c530d94ea4e543' into gingerbread-plus-aosp

* commit '0a6bfe2ae21f19adf65d8b8a18c530d94ea4e543':
  Add --max-res-version flag to aapt.
 2010-08-13 14:47:38 -07:00
Ficus Kirkpatrick
6f931c1173 am 2abde6e0: Add --max-res-version flag to aapt. 
Merge commit '2abde6e0ddaed3d2d60bad984a2adc3acbb8164c' into gingerbread

* commit '2abde6e0ddaed3d2d60bad984a2adc3acbb8164c':
  Add --max-res-version flag to aapt.
 2010-08-13 14:45:39 -07:00
Ficus Kirkpatrick
8746aeb424 am 7525c2cf: Merge "Add --max-res-version flag to aapt." into gingerbread 
Merge commit '7525c2cfbbaa5c947c029008ef490e93a50c064f' into gingerbread-plus-aosp

* commit '7525c2cfbbaa5c947c029008ef490e93a50c064f':
  Add --max-res-version flag to aapt.
 2010-08-13 14:27:41 -07:00
Romain Guy
5e1bf8d4fa am 1e4aa48c: Merge "fix [2912927] Can\'t get NV_draw_path extension to work" into gingerbread 
Merge commit '1e4aa48cfd2b2c13c4f7ace8c9fcb33adfa18661' into gingerbread-plus-aosp

* commit '1e4aa48cfd2b2c13c4f7ace8c9fcb33adfa18661':
  fix [2912927] Can't get NV_draw_path extension to work
 2010-08-13 14:27:36 -07:00
Jean-Baptiste Queru
024c8705bb Ignore 87624778 
It already exists in this branch

Change-Id: Ic4329e543d34828f41040dc264260be9d03a20e7
 2010-08-13 14:24:06 -07:00
Ficus Kirkpatrick
999a745146 Merge "Add --max-res-version flag to aapt." into gingerbread 2010-08-13 14:22:34 -07:00
Romain Guy
f285cb0975 Merge "fix [2912927] Can't get NV_draw_path extension to work" into gingerbread 2010-08-13 14:18:55 -07:00
Mathias Agopian
4a88b52235 fix [2912927] Can't get NV_draw_path extension to work 
there was a problem with eglGetProcAddress() which would only work with
GLES 1.x contexts.

Change-Id: I4747671cbf7ed469bb471a377f1d6f36550d24df
 2010-08-13 14:17:58 -07:00
Erik Gilling
38af31e3e2 am 94364b91: surfaceflinger: don\'t check HWComposer numLayers unless one exists 
Merge commit '94364b91a2894bf037b8beb027132fbb812e1434' into gingerbread-plus-aosp

* commit '94364b91a2894bf037b8beb027132fbb812e1434':
  surfaceflinger: don't check HWComposer numLayers unless one exists
 2010-08-13 10:13:39 -07:00
Erik Gilling
ae95765868 surfaceflinger: don't check HWComposer numLayers unless one exists 
Change-Id: I4b83f7bf7ba1318c70054117f14e759fe0ad105c
 2010-08-13 10:10:48 -07:00
Eric Laurent
2642e5b29f am c8d0d630: Merge "Fix issue 2909189: System property ro.audio.silent no longer mutes system." into gingerbread 
Merge commit 'c8d0d6307fc5cdd24083113456ac33790a5fb94a' into gingerbread-plus-aosp

* commit 'c8d0d6307fc5cdd24083113456ac33790a5fb94a':
  Fix issue 2909189: System property ro.audio.silent no longer mutes system.
 2010-08-13 08:06:23 -07:00
Eric Laurent
a54831c55e Merge "Fix issue 2909189: System property ro.audio.silent no longer mutes system." into gingerbread 2010-08-13 08:00:14 -07:00
John Wang
fcf5b9c268 am 686a9505: Merge "Update switch call and accept call." into gingerbread 
Merge commit '686a95055896c221c62fe7f4c3dda137809df91e' into gingerbread-plus-aosp

* commit '686a95055896c221c62fe7f4c3dda137809df91e':
  Update switch call and accept call.
 2010-08-12 17:33:19 -07:00
John Wang
dd978e3337 Merge "Update switch call and accept call." into gingerbread 2010-08-12 17:30:38 -07:00
James Dong
42d9c1bdb8 am e95d192f: Mainly fix two mistakes that I made: 
Merge commit 'e95d192fae5a80ed821c53bfea214a85ea395e90' into gingerbread-plus-aosp

* commit 'e95d192fae5a80ed821c53bfea214a85ea395e90':
  Mainly fix two mistakes that I made:
 2010-08-12 17:02:42 -07:00
Mike Dodd
3cae496ccb am 5f96138b: Merge "Support getting codec, width, and height in URL for gtalk playback." into gingerbread 
Merge commit '5f96138ba65cecf38d0c752d87ad47d931db8775' into gingerbread-plus-aosp

* commit '5f96138ba65cecf38d0c752d87ad47d931db8775':
  Support getting codec, width, and height in URL for gtalk playback.
 2010-08-12 16:47:52 -07:00