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

15297 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
John Wang
aba7fd6d20 am 81b7ea00: am f77fff4b: am 23c0b2eb: Merge "Add ILLEGAL_SIM_OR_ME error code." into froyo 2010-04-21 15:00:21 -07:00
John Wang
06b25c197b am f77fff4b: am 23c0b2eb: Merge "Add ILLEGAL_SIM_OR_ME error code." into froyo 
Merge commit 'f77fff4b4e904486bf25affde713294d40764e15' into kraken

* commit 'f77fff4b4e904486bf25affde713294d40764e15':
  Add ILLEGAL_SIM_OR_ME error code.
 2010-04-21 14:51:43 -07:00
John Wang
bf82df79f7 am 23c0b2eb: Merge "Add ILLEGAL_SIM_OR_ME error code." into froyo 
Merge commit '23c0b2eb5a610030ad5afe406987cb09c858ccfb' into froyo-plus-aosp

* commit '23c0b2eb5a610030ad5afe406987cb09c858ccfb':
  Add ILLEGAL_SIM_OR_ME error code.
 2010-04-21 14:46:06 -07:00
John Wang
f9dc03312a Merge "Add ILLEGAL_SIM_OR_ME error code." into froyo 2010-04-21 14:43:12 -07:00
Joe Onorato
795e2c3a03 am a8624186: am 46fba3b9: am 52e70b25: Add title to recent apps dialog. 2010-04-21 11:20:59 -07:00
Joe Onorato
ef69d8b0c9 am 46fba3b9: am 52e70b25: Add title to recent apps dialog. 
Merge commit '46fba3b9e1bb02aa603ffbb17907f081be0ca873' into kraken

* commit '46fba3b9e1bb02aa603ffbb17907f081be0ca873':
  Add title to recent apps dialog.
 2010-04-21 11:12:29 -07:00
Joe Onorato
c3e744227a am 52e70b25: Add title to recent apps dialog. 
Merge commit '52e70b25f8c2f652c27595c8fea0b6cb9f9ed87a' into froyo-plus-aosp

* commit '52e70b25f8c2f652c27595c8fea0b6cb9f9ed87a':
  Add title to recent apps dialog.
 2010-04-21 11:07:43 -07:00
The Android Open Source Project
4434a98b64 am d29eafdb: am f021d12f: merge from open-source master 2010-04-21 09:24:17 -07:00
The Android Open Source Project
a327dcfd79 am f021d12f: merge from open-source master 
Merge commit 'f021d12f6f7116e9275cd3553a349ce5cb8aab14' into kraken

* commit 'f021d12f6f7116e9275cd3553a349ce5cb8aab14':
  Allow META* macros outside of the framework
  Fix printing order of phone objects creation
 2010-04-21 09:15:15 -07:00
The Android Open Source Project
fc821e5d26 merge from open-source master 
Change-Id: I08f1feae65b1dfc3f740d78654c267f2e3ae5e85
 2010-04-21 09:10:43 -07:00
Daisuke Miyakawa
95190a548b Merge "vCard refactoring." 2010-04-21 00:10:59 -07:00
Mathias Agopian
7d7842465b am e1d851d3: (-s ours) am 172673cd: (-s ours) am 83512d4d: DO NOT MERGE fix [2557396] Adreno200: glDrawTexi() doesn\'t work with height <= 16 2010-04-20 22:35:24 -07:00
Mathias Agopian
9318b6088d am 172673cd: (-s ours) am 83512d4d: DO NOT MERGE fix [2557396] Adreno200: glDrawTexi() doesn\'t work with height <= 16 
Merge commit '172673cd5b21dee6e175ab67235aa19bc2689868' into kraken

* commit '172673cd5b21dee6e175ab67235aa19bc2689868':
  DO NOT MERGE fix [2557396] Adreno200: glDrawTexi() doesn't work with height <= 16
 2010-04-20 22:29:05 -07:00
Mathias Agopian
07a4eb35f9 am 83512d4d: DO NOT MERGE fix [2557396] Adreno200: glDrawTexi() doesn\'t work with height <= 16 
Merge commit '83512d4dfc06137bc2d9db0cb62644c54f41a771' into froyo-plus-aosp

* commit '83512d4dfc06137bc2d9db0cb62644c54f41a771':
  DO NOT MERGE fix [2557396] Adreno200: glDrawTexi() doesn't work with height <= 16
 2010-04-20 22:26:45 -07:00
Mathias Agopian
11777e9a6e DO NOT MERGE fix [2557396] Adreno200: glDrawTexi() doesn't work with height <= 16 
don't use glDrawTexi() anymore

Change-Id: If71334de39114b0edce7771366f8d8dc26f6911e
 2010-04-20 21:55:40 -07:00
Jeff Brown
664db8992d am bba573c2: am ccc96754: am 22caecda: Merge "Fix PM crash due to bad array bookkeeping logic." into froyo 2010-04-20 18:05:50 -07:00
Jeff Brown
bc0f0c84f5 am ccc96754: am 22caecda: Merge "Fix PM crash due to bad array bookkeeping logic." into froyo 
Merge commit 'ccc96754c5c6e31d6f782c3adeb06ad1694221d8' into kraken

* commit 'ccc96754c5c6e31d6f782c3adeb06ad1694221d8':
  Fix PM crash due to bad array bookkeeping logic.
 2010-04-20 17:57:29 -07:00
Jeff Brown
2bb2b502ab am 22caecda: Merge "Fix PM crash due to bad array bookkeeping logic." into froyo 
Merge commit '22caecda8a24c971972d78a112279c48f242d529' into froyo-plus-aosp

* commit '22caecda8a24c971972d78a112279c48f242d529':
  Fix PM crash due to bad array bookkeeping logic.
 2010-04-20 17:54:59 -07:00
Jeff Brown
27316b62fe Merge "Fix PM crash due to bad array bookkeeping logic." into froyo 2010-04-20 17:53:00 -07:00
Robert Greenwalt
454bada1d8 am 54f5ecc6: am 9127d9a5: am be348964: Merge "Move Tethering off the ServerThread." into froyo 2010-04-20 17:48:54 -07:00
Robert Greenwalt
0f26d526fc am 9127d9a5: am be348964: Merge "Move Tethering off the ServerThread." into froyo 
Merge commit '9127d9a5fd95d7454a10d44acb79079720f6bb91' into kraken

* commit '9127d9a5fd95d7454a10d44acb79079720f6bb91':
  Move Tethering off the ServerThread.
 2010-04-20 17:42:08 -07:00
Robert Greenwalt
ddc4682db0 am be348964: Merge "Move Tethering off the ServerThread." into froyo 
Merge commit 'be34896457bb37b4e263efa87316d2e2420adab3' into froyo-plus-aosp

* commit 'be34896457bb37b4e263efa87316d2e2420adab3':
  Move Tethering off the ServerThread.
 2010-04-20 17:39:38 -07:00
Robert Greenwalt
4dd043a420 Merge "Move Tethering off the ServerThread." into froyo 2010-04-20 17:37:22 -07:00
Andreas Huber
e4de161577 am f5e20801: am 89e28cbe: am 9e609b0d: Merge "Apparently select() does not immediately return if one of the masked socket descriptors is closed... Stop relying on select for read-with-timeout functionality and use SO_RCVTIMEO socket option instead." into froyo 2010-04-20 16:43:26 -07:00
Andreas Huber
be1c62dc6b am 89e28cbe: am 9e609b0d: Merge "Apparently select() does not immediately return if one of the masked socket descriptors is closed... Stop relying on select for read-with-timeout functionality and use SO_RCVTIMEO socket option instead." into froyo 
Merge commit '89e28cbefaff6ae9499032bb446ae7e72e019466' into kraken

* commit '89e28cbefaff6ae9499032bb446ae7e72e019466':
  Apparently select() does not immediately return if one of the masked socket descriptors is closed... Stop relying on select for read-with-timeout functionality and use SO_RCVTIMEO socket option instead.
 2010-04-20 16:37:35 -07:00
Mathias Agopian
e6b2da40fb am b834b38a: Merge "added setCrop() to android_native_window_t" into kraken 2010-04-20 16:37:29 -07:00
Mathias Agopian
0bbec614e4 am 827cda45: Merge "add support for up to 16 buffers per surface" into kraken 2010-04-20 16:37:25 -07:00
Andreas Huber
2c7118fac8 am 9e609b0d: Merge "Apparently select() does not immediately return if one of the masked socket descriptors is closed... Stop relying on select for read-with-timeout functionality and use SO_RCVTIMEO socket option instead." into froyo 
Merge commit '9e609b0dfa155fbe8ba3b5abd4faa188e2270dde' into froyo-plus-aosp

* commit '9e609b0dfa155fbe8ba3b5abd4faa188e2270dde':
  Apparently select() does not immediately return if one of the masked socket descriptors is closed... Stop relying on select for read-with-timeout functionality and use SO_RCVTIMEO socket option instead.
 2010-04-20 16:32:30 -07:00
Andreas Huber
09cf6538ea Merge "Apparently select() does not immediately return if one of the masked socket descriptors is closed... Stop relying on select for read-with-timeout functionality and use SO_RCVTIMEO socket option instead." into froyo 2010-04-20 16:29:23 -07:00
Mathias Agopian
082e3be0da Merge "added setCrop() to android_native_window_t" into kraken 2010-04-20 16:28:24 -07:00
Mathias Agopian
f2d283de91 Merge "add support for up to 16 buffers per surface" into kraken 2010-04-20 16:28:14 -07:00
Jean-Michel Trivi
fa5340d1e5 am 219dbb67: am 8dc4c790: am fe8620ac: Merge "Update AudioService to reflect phone state changes with AudioFocus. Phone calls and rings are treated as a new client, with a dedicated client ID that identifies it in the audio focus stack. When it is present in the stack 2010-04-20 16:15:33 -07:00
Mathias Agopian
aae4b44357 am 360865e2: Merge "clean-up surfaceflinger a bit" into kraken 2010-04-20 16:08:06 -07:00
Jean-Michel Trivi
6a141ea18a am 8dc4c790: am fe8620ac: Merge "Update AudioService to reflect phone state changes with AudioFocus. Phone calls and rings are treated as a new client, with a dedicated client ID that identifies it in the audio focus stack. When it is present in the stack, others clie 
Merge commit '8dc4c790e2c278f8f671c728401ee9458d2d74ab' into kraken

* commit '8dc4c790e2c278f8f671c728401ee9458d2d74ab':
  Update AudioService to reflect phone state changes with AudioFocus.
 2010-04-20 16:04:08 -07:00
Jean-Michel Trivi
ac4c0581c5 am fe8620ac: Merge "Update AudioService to reflect phone state changes with AudioFocus. Phone calls and rings are treated as a new client, with a dedicated client ID that identifies it in the audio focus stack. When it is present in the stack, others clients cannot re 
Merge commit 'fe8620ac42c9b61ab47fab83caa34816e6404ee5' into froyo-plus-aosp

* commit 'fe8620ac42c9b61ab47fab83caa34816e6404ee5':
  Update AudioService to reflect phone state changes with AudioFocus.
 2010-04-20 16:00:58 -07:00
Mathias Agopian
b1ab57601a Merge "clean-up surfaceflinger a bit" into kraken 2010-04-20 15:59:57 -07:00
Mathias Agopian
78fd5010a8 clean-up surfaceflinger a bit 
get rid of the glDrawTexi path and use floating points instead of fixed point maths

Change-Id: I3aa9ce2dc082f702160e605a16ba5fe987cdf087
 2010-04-20 15:58:36 -07:00
Jean-Michel Trivi
d1f799f11c Merge "Update AudioService to reflect phone state changes with AudioFocus. Phone calls and rings are treated as a new client, with a dedicated client ID that identifies it in the audio focus stack. When it is present in the stack, others clients cannot request audio focus (request is denied). Because the phone state is now mostly handled like a new client, there is no need monitor mode changes and to keep track of undispatched focus changes, as those will delayed focus gains will now automatically happen at the end of the call when the phone client is removed from the focus stack." into froyo 2010-04-20 15:57:30 -07:00
Suchi Amalapurapu
91be3d2eff am 0c64ff75: am d32f9422: am 0dde41fb: Merge "Fix 2610961 Unhide broadcast intents that are sent when sdcard gets mounted/unmounted." into froyo 2010-04-20 15:22:15 -07:00
Suchi Amalapurapu
c4f41a76b6 am d32f9422: am 0dde41fb: Merge "Fix 2610961 Unhide broadcast intents that are sent when sdcard gets mounted/unmounted." into froyo 
Merge commit 'd32f942280cc4390ab853321557eef06292b300e' into kraken

* commit 'd32f942280cc4390ab853321557eef06292b300e':
  Fix 2610961
 2010-04-20 15:14:41 -07:00
Suchi Amalapurapu
c0c5f705e1 am 0dde41fb: Merge "Fix 2610961 Unhide broadcast intents that are sent when sdcard gets mounted/unmounted." into froyo 
Merge commit '0dde41fbe0e36bfe059399c839604267ad0318c1' into froyo-plus-aosp

* commit '0dde41fbe0e36bfe059399c839604267ad0318c1':
  Fix 2610961
 2010-04-20 15:08:50 -07:00
Andreas Huber
0fca57fe9d am c9553f2e: am 1e1edb2c: am 25dc5f30: Merge "Don\'t coalesce more than 250ms worth of encoded data into a single codec input buffer. This currently only applies to the component OMX.TI.AAC.decode, it is the only one to support coalescing in the first place." into fro 2010-04-20 15:05:50 -07:00
Suchi Amalapurapu
b39bdc37ba Merge "Fix 2610961 Unhide broadcast intents that are sent when sdcard gets mounted/unmounted." into froyo 2010-04-20 15:04:41 -07:00
Andreas Huber
68e3b83cf8 am 1e1edb2c: am 25dc5f30: Merge "Don\'t coalesce more than 250ms worth of encoded data into a single codec input buffer. This currently only applies to the component OMX.TI.AAC.decode, it is the only one to support coalescing in the first place." into froyo 
Merge commit '1e1edb2c7376dbd9ca24bbeefbddbe4221f397a0' into kraken

* commit '1e1edb2c7376dbd9ca24bbeefbddbe4221f397a0':
  Don't coalesce more than 250ms worth of encoded data into a single codec input buffer.
 2010-04-20 14:57:25 -07:00
Jean-Michel Trivi
e10105f0cd am bb331f73: am 0fabf2e8: am 8ccbd4ba: Merge "Fix bug 2604132 40s skip after undocking In case of A2DP write errors, there is an overflow in the calculation of the sleep duration to simulate the timing of a successful write." into froyo 2010-04-20 14:56:51 -07:00
Andreas Huber
3338371999 am 25dc5f30: Merge "Don\'t coalesce more than 250ms worth of encoded data into a single codec input buffer. This currently only applies to the component OMX.TI.AAC.decode, it is the only one to support coalescing in the first place." into froyo 
Merge commit '25dc5f30b2a8276c5790c7152a801fcd905c7281' into froyo-plus-aosp

* commit '25dc5f30b2a8276c5790c7152a801fcd905c7281':
  Don't coalesce more than 250ms worth of encoded data into a single codec input buffer.
 2010-04-20 14:52:57 -07:00
Andreas Huber
7b783a8be7 Merge "Don't coalesce more than 250ms worth of encoded data into a single codec input buffer. This currently only applies to the component OMX.TI.AAC.decode, it is the only one to support coalescing in the first place." into froyo 2010-04-20 14:48:45 -07:00
Jean-Michel Trivi
5bd957f458 am 0fabf2e8: am 8ccbd4ba: Merge "Fix bug 2604132 40s skip after undocking In case of A2DP write errors, there is an overflow in the calculation of the sleep duration to simulate the timing of a successful write." into froyo 
Merge commit '0fabf2e81559106cb4aaf9e8ba45b0bed37d5eb8' into kraken

* commit '0fabf2e81559106cb4aaf9e8ba45b0bed37d5eb8':
  Fix bug 2604132 40s skip after undocking
 2010-04-20 14:48:15 -07:00
Jean-Michel Trivi
394da77279 am 8ccbd4ba: Merge "Fix bug 2604132 40s skip after undocking In case of A2DP write errors, there is an overflow in the calculation of the sleep duration to simulate the timing of a successful write." into froyo 
Merge commit '8ccbd4ba6d7f1180284df7aa5735dba48b10d8ee' into froyo-plus-aosp

* commit '8ccbd4ba6d7f1180284df7aa5735dba48b10d8ee':
  Fix bug 2604132 40s skip after undocking
 2010-04-20 14:45:06 -07:00
Jean-Michel Trivi
ab1f727968 Merge "Fix bug 2604132 40s skip after undocking In case of A2DP write errors, there is an overflow in the calculation of the sleep duration to simulate the timing of a successful write." into froyo 2010-04-20 14:41:11 -07:00