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

15537 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Bjorn Bringert
ab11b0e68c am cb4c894a: Merge "bugfix for: OOM error while doing voice search repeatedly" into froyo 
Merge commit 'cb4c894afa497943258cfb053ca35436f7b8e29a' into froyo-plus-aosp

* commit 'cb4c894afa497943258cfb053ca35436f7b8e29a':
  bugfix for: OOM error while doing voice search repeatedly
 2010-04-26 10:05:57 -07:00
Bjorn Bringert
89a7523222 Merge "bugfix for: OOM error while doing voice search repeatedly" into froyo 2010-04-26 07:52:58 -07:00
Grace Kloba
dde6caf374 am 60ae65ed: am 87782f2b: 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.g 
Merge commit '60ae65ed30564969b3e14642394c5e22c019125d' into kraken

* commit '60ae65ed30564969b3e14642394c5e22c019125d':
  Restrict the range request to the servers claiming
 2010-04-23 17:19:39 -07:00
Raphael
a1744ca806 am 7fca18d4: am 29355534: Fix aapt to build in Windows SDK under Linux 
Merge commit '7fca18d4eadd3da0e616f2663aca41be4a01ec2f' into kraken

* commit '7fca18d4eadd3da0e616f2663aca41be4a01ec2f':
  Fix aapt to build in Windows SDK under Linux
 2010-04-23 17:19:35 -07:00
Grace Kloba
a3a660c918 am bd17156f: am 85a8dcec: 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 
Merge commit 'bd17156fda946fa0594687337bbd43cd85300940' into kraken

* commit 'bd17156fda946fa0594687337bbd43cd85300940':
  Only honor the scrollbar mode at the minimum zoom
 2010-04-23 17:19:31 -07:00
Grace Kloba
a62848ae0b am 87782f2b: 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/# 
Merge commit '87782f2bdfc679fd8f3c7ae7cd72bfd0e71efdc6' into froyo-plus-aosp

* commit '87782f2bdfc679fd8f3c7ae7cd72bfd0e71efdc6':
  Restrict the range request to the servers claiming
 2010-04-23 17:14:49 -07:00
Raphael
56c1e76d5e am 29355534: Fix aapt to build in Windows SDK under Linux 
Merge commit '29355534384ee24bfe9a3bc97d7664dbe478b4fb' into froyo-plus-aosp

* commit '29355534384ee24bfe9a3bc97d7664dbe478b4fb':
  Fix aapt to build in Windows SDK under Linux
 2010-04-23 17:14:21 -07:00
Grace Kloba
286778a9e5 am 85a8dcec: 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 
Merge commit '85a8dcec5460edda72e9917d4f02ad1b6a133251' into froyo-plus-aosp

* commit '85a8dcec5460edda72e9917d4f02ad1b6a133251':
  Only honor the scrollbar mode at the minimum zoom
 2010-04-23 17:14:15 -07:00
Adam Powell
4ad6092674 resolved conflicts for merge of 81cd2e90 to master 
Fixed public.xml value padding for kraken/master

Merge commit '81cd2e90' into manualmerge

Conflicts:
	api/current.xml

Change-Id: I09d2c5c7e6acbf4086c0bb8756a5aaf41a646d71
 2010-04-23 16:49:54 -07:00
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
Dianne Hackborn
e9de49a752 am 1bdbb072: am cdf96f75: am 8b0047f8: Merge "Fix typo when parsing external platform version from Settings." into froyo 2010-04-23 15:30:21 -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
58ff1ee5b5 am cdf96f75: am 8b0047f8: Merge "Fix typo when parsing external platform version from Settings." into froyo 
Merge commit 'cdf96f75da540d880ae6070d861aeb6adabbe9a3' into kraken

* commit 'cdf96f75da540d880ae6070d861aeb6adabbe9a3':
  Fix typo when parsing external platform version from Settings.
 2010-04-23 15:25:09 -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
081a8f086f am 460587e9: am f6adae78: am 47dad8fa: Merge "Fix bug 2619062 Music is routed to Phone speaker, though it is connected to A2DP media profile" into froyo 2010-04-23 15:00:29 -07:00
Jean-Michel Trivi
3fad8a6b3d am f6adae78: am 47dad8fa: Merge "Fix bug 2619062 Music is routed to Phone speaker, though it is connected to A2DP media profile" into froyo 
Merge commit 'f6adae7866e893afa05b5838bdd244648a66ac3f' into kraken

* commit 'f6adae7866e893afa05b5838bdd244648a66ac3f':
  Fix bug 2619062 Music is routed to Phone speaker, though it is
 2010-04-23 14:53:09 -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
742604ec2b am 8aed789f: am 994e3990: am 2adec762: Merge "Fix issue #2621809: Kill! Kill! Kill!" into froyo 2010-04-23 14:36:21 -07:00
Neal Nguyen
ad5aeb88a4 am 0c817ba3: am 27e5a95a: am 5fa65082: Merge "Re-enabling unit tests for PackageManager/Apps on SD." into froyo 2010-04-23 14:36:17 -07:00
Dianne Hackborn
aba26a8ba4 am 994e3990: am 2adec762: Merge "Fix issue #2621809: Kill! Kill! Kill!" into froyo 
Merge commit '994e39908b167fb70883ce6c1146433e0486e86f' into kraken

* commit '994e39908b167fb70883ce6c1146433e0486e86f':
  Fix issue #2621809: Kill! Kill! Kill!
 2010-04-23 14:28:52 -07:00
Neal Nguyen
a4c0e8f248 am 27e5a95a: am 5fa65082: Merge "Re-enabling unit tests for PackageManager/Apps on SD." into froyo 
Merge commit '27e5a95afc10faca6314f9b710f07e8f99b3311f' into kraken

* commit '27e5a95afc10faca6314f9b710f07e8f99b3311f':
  Re-enabling unit tests for PackageManager/Apps on SD.
 2010-04-23 14:28:48 -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
7a4fcd50b4 am 9ef25759: am b6c770e4: am 0b2ebe9b: Merge "Respond to changes in throttle policy." into froyo 2010-04-23 14:02:31 -07:00
Robert Greenwalt
01265a73ec am b6c770e4: am 0b2ebe9b: Merge "Respond to changes in throttle policy." into froyo 
Merge commit 'b6c770e4e387bd73d4e7d4cbad99079b37f59043' into kraken

* commit 'b6c770e4e387bd73d4e7d4cbad99079b37f59043':
  Respond to changes in throttle policy.
 2010-04-23 13:55:05 -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
Steve Block
ba4956ddda Merge "Updates DumpRenderTree ignore list to reflect status of touch event tests at current WebKit revision (r54731)." 2010-04-23 13:39:07 -07:00
Dianne Hackborn
cc4aa23654 am 0c1be50f: am dc14dc6d: am bf73bbff: Merge "Some debugging help for issue #2594388" into froyo 2010-04-23 13:12:47 -07:00
Dianne Hackborn
f50d849da8 am dc14dc6d: am bf73bbff: Merge "Some debugging help for issue #2594388" into froyo 
Merge commit 'dc14dc6d60675be688c333bbc60a315d2c658054' into kraken

* commit 'dc14dc6d60675be688c333bbc60a315d2c658054':
  Some debugging help for issue #2594388
 2010-04-23 13:06:02 -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
Vasu Nori
901f24f828 Merge "fix a bug introduced when prepared-statement cache was made LRU-based" 2010-04-23 11:52:34 -07:00
Robert Greenwalt
d1e9b02d46 am d066e3c2: am 1b5a9c5d: am 251ccef0: Merge "Add a Throttle check shortly after boot." into froyo 2010-04-23 10:31:47 -07:00
Robert Greenwalt
d3807fb4ef am 1b5a9c5d: am 251ccef0: Merge "Add a Throttle check shortly after boot." into froyo 
Merge commit '1b5a9c5d2fdf353d12ef1ca11dafc78f4c6f6c81' into kraken

* commit '1b5a9c5d2fdf353d12ef1ca11dafc78f4c6f6c81':
  Add a Throttle check shortly after boot.
 2010-04-23 10:24:24 -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
96cc1a1670 am d54c48b2: am 9666bbdf: am 7b88af67: Merge "bug #2618035: applying Moto\'s patch to fix a email/shortcode parsing bug." into froyo 2010-04-22 16:47:17 -07:00
Wei Huang
7b956cc02c am 9666bbdf: am 7b88af67: Merge "bug #2618035: applying Moto\'s patch to fix a email/shortcode parsing bug." into froyo 
Merge commit '9666bbdf1bb96dbf42b88443ad042e63971bfb4a' into kraken

* commit '9666bbdf1bb96dbf42b88443ad042e63971bfb4a':
  bug #2618035: applying Moto's patch to fix a email/shortcode parsing bug.
 2010-04-22 16:41:17 -07:00
Dianne Hackborn
c9f8318b28 am e06c1e38: am 4bcdd6b0: am 90c6aec1: Merge "Fix issue #2619247: Music sometimes stops playing when navigation talks" into froyo 2010-04-22 16:38:14 -07:00
Dianne Hackborn
f22988f610 am 2fe441fa: am 476a57e6: am 9bc0a572: Merge "Fix issue #2608292: Fails to launch the video camera preview" into froyo 2010-04-22 16:38:10 -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
a4a0502342 am 4bcdd6b0: am 90c6aec1: Merge "Fix issue #2619247: Music sometimes stops playing when navigation talks" into froyo 
Merge commit '4bcdd6b0688735d7da0eb2a4f211b4b4c8911e3b' into kraken

* commit '4bcdd6b0688735d7da0eb2a4f211b4b4c8911e3b':
  Fix issue #2619247: Music sometimes stops playing when navigation talks
 2010-04-22 16:30:01 -07:00
Dianne Hackborn
27d6a25bc2 am 476a57e6: am 9bc0a572: Merge "Fix issue #2608292: Fails to launch the video camera preview" into froyo 
Merge commit '476a57e64a7fa7143e434c1064df1fa87fe4b01a' into kraken

* commit '476a57e64a7fa7143e434c1064df1fa87fe4b01a':
  Fix issue #2608292: Fails to launch the video camera preview
 2010-04-22 16:29:56 -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