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

14645 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Grace Kloba
f0d64eb1af Merge "Restrict the range request to the servers claiming that they accept ranges. This may be too restrict as the spec says the server MAY set this in the response header. But this is the last minute change made in https://android-git.corp.google.com/g/#change,49444 I think it is safer to be conservative." into froyo 2010-04-23 16:19:22 -07:00
Grace Kloba
1bffbf24e0 Merge "Only honor the scrollbar mode at the minimum zoom level. This reduced the impact of https://android-git.corp.google.com/g/#change,48683. In GB, we need to revisit this issue." into froyo 2010-04-23 15:27:58 -07:00
Dianne Hackborn
b1e94813d1 am 8b0047f8: Merge "Fix typo when parsing external platform version from Settings." into froyo 
Merge commit '8b0047f82504ebc9b282ed950a85a758b59c4e14' into froyo-plus-aosp

* commit '8b0047f82504ebc9b282ed950a85a758b59c4e14':
  Fix typo when parsing external platform version from Settings.
 2010-04-23 15:22:55 -07:00
Dianne Hackborn
8610b8090f Merge "Fix typo when parsing external platform version from Settings." into froyo 2010-04-23 15:19:34 -07:00
Jean-Michel Trivi
88bbe89139 am 47dad8fa: Merge "Fix bug 2619062 Music is routed to Phone speaker, though it is connected to A2DP media profile" into froyo 
Merge commit '47dad8fa8d1eddf31dd0665a6d341e2f4f593d08' into froyo-plus-aosp

* commit '47dad8fa8d1eddf31dd0665a6d341e2f4f593d08':
  Fix bug 2619062 Music is routed to Phone speaker, though it is
 2010-04-23 14:50:55 -07:00
Jean-Michel Trivi
6f675cfb63 Merge "Fix bug 2619062 Music is routed to Phone speaker, though it is connected to A2DP media profile" into froyo 2010-04-23 14:48:10 -07:00
Dianne Hackborn
dd75ae71a0 am 2adec762: Merge "Fix issue #2621809: Kill! Kill! Kill!" into froyo 
Merge commit '2adec762fbb61c73f612acb7463ba765de1296ad' into froyo-plus-aosp

* commit '2adec762fbb61c73f612acb7463ba765de1296ad':
  Fix issue #2621809: Kill! Kill! Kill!
 2010-04-23 14:25:05 -07:00
Neal Nguyen
6b9fa2b713 am 5fa65082: Merge "Re-enabling unit tests for PackageManager/Apps on SD." into froyo 
Merge commit '5fa65082f16741394dcfbe756e3880d5c018dace' into froyo-plus-aosp

* commit '5fa65082f16741394dcfbe756e3880d5c018dace':
  Re-enabling unit tests for PackageManager/Apps on SD.
 2010-04-23 14:25:01 -07:00
Dianne Hackborn
ddf83ba28c Merge "Fix issue #2621809: Kill! Kill! Kill!" into froyo 2010-04-23 14:23:39 -07:00
Neal Nguyen
bc33726ea9 Merge "Re-enabling unit tests for PackageManager/Apps on SD." into froyo 2010-04-23 14:21:53 -07:00
Robert Greenwalt
37d3dc06b6 am 0b2ebe9b: Merge "Respond to changes in throttle policy." into froyo 
Merge commit '0b2ebe9b45172b9147f86fd69eedb2a200982b68' into froyo-plus-aosp

* commit '0b2ebe9b45172b9147f86fd69eedb2a200982b68':
  Respond to changes in throttle policy.
 2010-04-23 13:52:18 -07:00
Robert Greenwalt
2e909fffdc Merge "Respond to changes in throttle policy." into froyo 2010-04-23 13:50:03 -07:00
Dianne Hackborn
cde3f26b63 am bf73bbff: Merge "Some debugging help for issue #2594388" into froyo 
Merge commit 'bf73bbffc18f5abb5350fa3a410830c05ad10206' into froyo-plus-aosp

* commit 'bf73bbffc18f5abb5350fa3a410830c05ad10206':
  Some debugging help for issue #2594388
 2010-04-23 13:02:29 -07:00
Dianne Hackborn
db62452136 Merge "Some debugging help for issue #2594388" into froyo 2010-04-23 12:59:47 -07:00
Robert Greenwalt
d77daac640 am 251ccef0: Merge "Add a Throttle check shortly after boot." into froyo 
Merge commit '251ccef0445d4456809bfc41a6344e2dae24f2c3' into froyo-plus-aosp

* commit '251ccef0445d4456809bfc41a6344e2dae24f2c3':
  Add a Throttle check shortly after boot.
 2010-04-23 10:20:37 -07:00
Robert Greenwalt
41e202245b Merge "Add a Throttle check shortly after boot." into froyo 2010-04-23 10:17:14 -07:00
Wei Huang
6ece8383ec am 7b88af67: Merge "bug #2618035: applying Moto\'s patch to fix a email/shortcode parsing bug." into froyo 
Merge commit '7b88af679a9a3b5737343bb996ef392b76d19e73' into froyo-plus-aosp

* commit '7b88af679a9a3b5737343bb996ef392b76d19e73':
  bug #2618035: applying Moto's patch to fix a email/shortcode parsing bug.
 2010-04-22 16:35:56 -07:00
Wei Huang
411b51f1f1 Merge "bug #2618035: applying Moto's patch to fix a email/shortcode parsing bug." into froyo 2010-04-22 16:33:40 -07:00
Dianne Hackborn
c1353e2873 am 90c6aec1: Merge "Fix issue #2619247: Music sometimes stops playing when navigation talks" into froyo 
Merge commit '90c6aec10f969acf9b171b82920480fb6aeb007f' into froyo-plus-aosp

* commit '90c6aec10f969acf9b171b82920480fb6aeb007f':
  Fix issue #2619247: Music sometimes stops playing when navigation talks
 2010-04-22 16:26:59 -07:00
Dianne Hackborn
0bc7251d3a am 9bc0a572: Merge "Fix issue #2608292: Fails to launch the video camera preview" into froyo 
Merge commit '9bc0a572d8459e0b6209e8a68cb680389c1f8b73' into froyo-plus-aosp

* commit '9bc0a572d8459e0b6209e8a68cb680389c1f8b73':
  Fix issue #2608292: Fails to launch the video camera preview
 2010-04-22 16:24:08 -07:00
Dianne Hackborn
c4384ad5c7 Merge "Fix issue #2619247: Music sometimes stops playing when navigation talks" into froyo 2010-04-22 16:23:44 -07:00
Dianne Hackborn
f78357eb2b Merge "Fix issue #2608292: Fails to launch the video camera preview" into froyo 2010-04-22 16:20:19 -07:00
Suchi Amalapurapu
81f09d8d54 am a2a568e5: Merge "Fix error code when media is filled up." into froyo 
Merge commit 'a2a568e58d77848471a2f1d9ab6df2cbb2c916d6' into froyo-plus-aosp

* commit 'a2a568e58d77848471a2f1d9ab6df2cbb2c916d6':
  Fix error code when media is filled up.
 2010-04-22 15:54:37 -07:00
Suchi Amalapurapu
5014549476 Merge "Fix error code when media is filled up." into froyo 2010-04-22 15:52:25 -07:00
Leon Scroggins
49f4cbd5da am 69ec5c22: Remove the WebTextView if it is drawing when it shouldn\'t. 
Merge commit '69ec5c22d09690d33f0b87a386de13cc61eb9b42' into froyo-plus-aosp

* commit '69ec5c22d09690d33f0b87a386de13cc61eb9b42':
  Remove the WebTextView if it is drawing when it shouldn't.
 2010-04-22 14:26:38 -07:00
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
Kenny Root
f6de34a2c4 Merge "Fix broken logic in SettingsProvider.parseProviderList." 2010-04-21 20:06:51 -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
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
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
fc821e5d26 merge from open-source master 
Change-Id: I08f1feae65b1dfc3f740d78654c267f2e3ae5e85
 2010-04-21 09:10:43 -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
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
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
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
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