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

15467 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Grace Kloba
3c76633e4e am a6ece18d: Merge "Added the subset of partial content support so that we can continue the interrupted request to support streaming the content even with a brief disconnection." into froyo 
Merge commit 'a6ece18d95a35acc4fb3f9648403ce42d0d6b2d7' into froyo-plus-aosp

* commit 'a6ece18d95a35acc4fb3f9648403ce42d0d6b2d7':
  Added the subset of partial content support so that
 2010-04-22 13:05:15 -07:00
Grace Kloba
6df8f3f5f6 Merge "Added the subset of partial content support so that we can continue the interrupted request to support streaming the content even with a brief disconnection." into froyo 2010-04-22 13:01:55 -07:00
Christopher Tate
83160964d6 am 75a53705: Merge "SDK: new \'bmgr\' docs in the Dev Guide" into froyo 
Merge commit '75a537051de4220d32e8aa72348909757fa11e5d' into froyo-plus-aosp

* commit '75a537051de4220d32e8aa72348909757fa11e5d':
  SDK: new 'bmgr' docs in the Dev Guide
 2010-04-22 12:54:36 -07:00
Christopher Tate
b54bb38429 Merge "SDK: new 'bmgr' docs in the Dev Guide" into froyo 2010-04-22 12:51:22 -07:00
The Android Open Source Project
315583c834 merge from open-source master 
Change-Id: I2a3a06f0bd3530f9c0d3cb64ca6a87913649d64b
 2010-04-22 11:43:17 -07:00
Robert Greenwalt
2548cbe2ed am 05fa2144: Merge "Trim throttle logs." into froyo 
Merge commit '05fa2144e458dc8f024235ea01b8682055d828bf' into froyo-plus-aosp

* commit '05fa2144e458dc8f024235ea01b8682055d828bf':
  Trim throttle logs.
 2010-04-22 09:11:35 -07:00
Robert Greenwalt
cb67e80453 Merge "Trim throttle logs." into froyo 2010-04-22 09:08:25 -07:00
Grace Kloba
e3db997414 am 2fba6d1c: Merge "Post a message to set SurfaceView to be visible when we switch to use the layout size. Otherwise it will first use the old dimension which can exceed the limit, which in turn causes the Browser to crash." into froyo 
Merge commit '2fba6d1c1b445b2d26ccd32eb4084e759f513c5d' into froyo-plus-aosp

* commit '2fba6d1c1b445b2d26ccd32eb4084e759f513c5d':
  Post a message to set SurfaceView to be visible when
 2010-04-22 08:23:35 -07:00
Grace Kloba
7de6c06c16 Merge "Post a message to set SurfaceView to be visible when we switch to use the layout size. Otherwise it will first use the old dimension which can exceed the limit, which in turn causes the Browser to crash." into froyo 2010-04-22 08:20:23 -07:00
Mathias Agopian
2ee3ec24c3 am 9bce8737: more surfaceflinger cleanups 2010-04-21 22:40:21 -07:00
Mathias Agopian
559377e9e1 am 33c8e2b8: Merge "better fix for [2420565] Surface.lockCanvas() updates the dirty region too often" into kraken 2010-04-21 22:33:18 -07:00
Mathias Agopian
1b5e1021b8 more surfaceflinger cleanups 
get rid of the "fake rtti" code, and use polymorphism instead.
also simplify how we log SF's state (using polymorphism)

Change-Id: I2bae7c98de4dd207a3e2b00083fa3fde7c467922
 2010-04-21 22:28:20 -07:00
Mathias Agopian
940bc0545f Merge "better fix for [2420565] Surface.lockCanvas() updates the dirty region too often" into kraken 2010-04-21 22:27:22 -07:00
Mathias Agopian
245e4d78c5 better fix for [2420565] Surface.lockCanvas() updates the dirty region too often 
Change-Id: I83438b40effd21538f1c74396dc665254b9d5ab6
 2010-04-21 22:25:35 -07:00
Kenny Root
de0ebcea90 Merge "Add tests for SettingsProvider.parseProviderList" 2010-04-21 20:24:10 -07:00
Kenny Root
f6de34a2c4 Merge "Fix broken logic in SettingsProvider.parseProviderList." 2010-04-21 20:06:51 -07:00
Christopher Tate
8c56afa677 am 1d6ff5a1: am 7e93aad4: am 36fa4713: Merge "Fix security hole in Google backup transport registration" into froyo 2010-04-21 18:28:08 -07:00
Christopher Tate
dc71e82592 am 7e93aad4: am 36fa4713: Merge "Fix security hole in Google backup transport registration" into froyo 
Merge commit '7e93aad42d5f96e4e3a471e49384e1ce794c9411' into kraken

* commit '7e93aad42d5f96e4e3a471e49384e1ce794c9411':
  Fix security hole in Google backup transport registration
 2010-04-21 18:19:38 -07:00
Christopher Tate
982c57d21e am 36fa4713: Merge "Fix security hole in Google backup transport registration" into froyo 
Merge commit '36fa47139d4621dc4bf8d89caa8650495d901b00' into froyo-plus-aosp

* commit '36fa47139d4621dc4bf8d89caa8650495d901b00':
  Fix security hole in Google backup transport registration
 2010-04-21 18:15:44 -07:00
Christopher Tate
2b2ae9f99b Merge "Fix security hole in Google backup transport registration" into froyo 2010-04-21 18:10:20 -07:00
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