25616 Commits

Author SHA1 Message Date
Jean-Baptiste Queru
f939518510 Revert "- updates NetUtils to use new libnetutils headers"
This reverts commit 9bf3bb21c097cc96f30d9bf3ec7dea62a74a738b.
2010-08-18 11:16:42 -07:00
Jean-Baptiste Queru
09f672509b resolved conflicts for merge of 0b7bd95d to gingerbread-plus-aosp
Change-Id: I55c1689c7d0737c943efec28d8164d6a5360621c
2010-08-17 15:24:11 -07:00
Rene Bolldorf
0b7bd95d69 Fix compilation errors in libmedia, libstagefright.
(invalid conversion from 'const char*' to 'char*')

Change-Id: Idef85606b7cff629b2778ed8134c79c892af54c2
2010-08-17 23:45:14 +02:00
Roman Nurik
96e24634c6 am e6bfceeb: am 3b70e159: Merge "Adding a sample accessibility service -make" into froyo
Merge commit 'e6bfceeb10a01c8e89f712c0ffddc9e5e3ad1842' into gingerbread-plus-aosp

* commit 'e6bfceeb10a01c8e89f712c0ffddc9e5e3ad1842':
  Adding a sample accessibility service -make
2010-08-17 10:50:25 -07:00
Roman Nurik
e6bfceeb10 am 3b70e159: Merge "Adding a sample accessibility service -make" into froyo
Merge commit '3b70e159a8168c1154d31d7b0552bb3b0c099334' into gingerbread

* commit '3b70e159a8168c1154d31d7b0552bb3b0c099334':
  Adding a sample accessibility service -make
2010-08-17 10:45:30 -07:00
Roman Nurik
3b70e159a8 Merge "Adding a sample accessibility service -make" into froyo 2010-08-17 10:36:03 -07:00
Jean-Baptiste Queru
ddbcce3afb Merge "resolved conflicts for merge of be50507b to gingerbread-plus-aosp" into gingerbread-plus-aosp 2010-08-17 09:05:27 -07:00
Jean-Baptiste Queru
6525fca692 resolved conflicts for merge of be50507b to gingerbread-plus-aosp
Change-Id: Iaa5fb62f7b82b488bca192e7f374c044c7e1e6a7
2010-08-17 09:01:26 -07:00
Steve Howard
ab59914de7 am b3e957bb: Merge "New download manager error code when we can\'t resume." into gingerbread
Merge commit 'b3e957bb9d3a3811412e5d94233c7f7e2e777c28' into gingerbread-plus-aosp

* commit 'b3e957bb9d3a3811412e5d94233c7f7e2e777c28':
  New download manager error code when we can't resume.
2010-08-17 08:27:17 -07:00
Steve Howard
b3e957bb9d Merge "New download manager error code when we can't resume." into gingerbread 2010-08-17 08:20:52 -07:00
Jean-Baptiste Queru
be50507bae Merge "Keep track of remaining fd when devices are removed" 2010-08-17 07:49:54 -07:00
Jean-Baptiste Queru
5085848ddb am 209e6518: Merge "Make the LED colors when charging customizable by the vendor"
Merge commit '209e651805dd40ea87df7ff67f2755605be9308c' into gingerbread-plus-aosp

* commit '209e651805dd40ea87df7ff67f2755605be9308c':
  Make the LED colors when charging customizable by the vendor
2010-08-17 07:48:50 -07:00
Jean-Baptiste Queru
234325b832 am c708e383: Merge "Revert "InputMethodService: Fix ignore case in showInputMethodPickerFromClient""
Merge commit 'c708e38356e9c381b640ef96db3b0b0fdd41d433' into gingerbread-plus-aosp

* commit 'c708e38356e9c381b640ef96db3b0b0fdd41d433':
  Revert "InputMethodService: Fix ignore case in showInputMethodPickerFromClient"
2010-08-17 07:48:30 -07:00
Jean-Baptiste Queru
18dd95f451 am 05b20c03: Merge "bootanimation: Don\'t open non-existing bootanimation.zip"
Merge commit '05b20c034d5a1ffe64c15d155dd8511b77b8989b' into gingerbread-plus-aosp

* commit '05b20c034d5a1ffe64c15d155dd8511b77b8989b':
  bootanimation: Don't open non-existing bootanimation.zip
2010-08-17 07:48:26 -07:00
Jean-Baptiste Queru
1a0b19b324 resolved conflicts for merge of bcbb5845 to gingerbread-plus-aosp
Change-Id: I04fb94c91958bcba3e587a8bf523c551d964f761
2010-08-17 07:41:59 -07:00
Jean-Baptiste Queru
209e651805 Merge "Make the LED colors when charging customizable by the vendor" 2010-08-17 07:35:08 -07:00
Mike Lockwood
264348361e 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
b6ef8bad8a Merge "GPS: Initialize XTRA support when GPS is enabled" into gingerbread 2010-08-17 04:46:29 -07:00
Mike Lockwood
1a1cd3a878 GPS: Initialize XTRA support when GPS is enabled
BUG: 2923148

Change-Id: If9a643e385c6c567b30f47d4caa35fa812a2ba43
Signed-off-by: Mike Lockwood <lockwood@android.com>
2010-08-17 07:45:47 -04:00
Joseph Wen
81dcea6093 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
Joseph Wen
f1f48bc7f2 Do JPEG tile-based decoding.
Change-Id: I5c1b4ac3c02eb4350ef0ba9a7877b22cfd730cfb
2010-08-17 14:34:02 +08:00
Jeff Brown
637df0456f 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
1ce4394c77 Merge "Throttle userActivity calls from input dispatcher." into gingerbread 2010-08-16 19:59:03 -07:00
Jeff Brown
90291577a0 Throttle userActivity calls from input dispatcher.
Results in an approximately 60% reduction in InputDispatcher thread CPU time.
(Went from 3% to 1% when measured with CPU frequency scaling disabled.)

Change-Id: Ia6e6087a719ee518fe37b428a871c7240bd4143f
2010-08-16 18:33:50 -07:00
Mathias Agopian
98a94989dd 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
Steve Howard
33bbd12a05 New download manager error code when we can't resume.
Adding DownloadManager.ERROR_CANNOT_RESUME for when we can't resume an
interrupted download (because the server didn't provide an ETag or
doesn't support range requests), as well as the necessary private
status code in Downloads.Impl.

Change-Id: I5a66f1e1964198552ab2216aa6d3cc0db2254e21
2010-08-16 14:28:17 -07:00
Mathias Agopian
833533c929 Improve Display javadoc slightly
Change-Id: Iaa7d599e11d42d4aaf50e87b141f9b8d04ba445e
2010-08-16 13:30:20 -07:00
Daniel Sandler
e03e6d3072 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
f54da15b7c 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
bb33d6fd98 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
80810f86e9 Merge "Fix crash in status bar ticker." into gingerbread 2010-08-16 12:22:29 -07:00
Daniel Sandler
f8d5809eee Fix crash in status bar ticker.
Bug: 2900850
Change-Id: Iaf71e093578501258a24cd43e5deaf624d28461e
2010-08-16 15:15:41 -04:00
Jean-Baptiste Queru
c708e38356 Merge "Revert "InputMethodService: Fix ignore case in showInputMethodPickerFromClient"" 2010-08-16 12:07:26 -07:00
James Dong
eff30e3d1b Change the default time scale for audio/video track during recording
and reduce rounding errors in calculating the sample duration

- Default time scale for tracks other than audio is set to 90000.
- Audio track by default uses the audio sampling rate as the time scale.
- Default movie time scale remains to be 1000.
- The default time scale values will be overwritten by a user-supplied value if exits.

Change-Id: I81b40ed0626ea45e9fd24a89e21a2c5a4a2c3415
2010-08-16 10:38:35 -07:00
satok
12af0e3eb3 Revert "InputMethodService: Fix ignore case in showInputMethodPickerFromClient"
This reverts commit f2e67a5779d404b4791c6ab5b0d30dfb2c463514.

Open Source Project CL: https://review.source.android.com/#change,16419
This change unexpectedly started preventing users from changing Input-Method.

How to reproduce
1. Long press "?123" button in LatinIME
2. Select "Input method"
3. No window will open.

Change-Id: Ie0d4b58900a9b06aa9d43f9fa0bea5165294fa30
2010-08-17 02:18:11 +09:00
Doug Zongker
997dc32b6b Merge "add an api for getting a device serial number" into gingerbread 2010-08-16 09:19:40 -07:00
Doug Zongker
7d2e3df60d add an api for getting a device serial number
Add a constant to android.os.Build that returns a device-specific
alphanumeric serial number.  It's optional -- it may be blank --
though CTS will require it to be present for non-telephony devices.

Change-Id: I338ae5f43ba679a5e98f2f437dc4efdaef0c835d
2010-08-16 09:18:50 -07:00
Jean-Baptiste Queru
05b20c034d Merge "bootanimation: Don't open non-existing bootanimation.zip" 2010-08-16 09:15:17 -07:00
Jean-Baptiste Queru
bcbb584569 Merge "frameworks/base/opengl: Add NULL check" 2010-08-16 08:57:29 -07:00
Chung-yih Wang
4a054c1a5d 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
Chung-yih Wang
cfd15dd3c8 Fix the IN_CALL mode issue.
If the sip call is on-holding, we should not set the audio to
MODE_NORMAL, or it will affect the audio if there is an active pstn
call.

Change-Id: If1bcba952617bf8427bc9e2d64d483ba1ee37370
2010-08-16 18:02:31 +08:00
Dianne Hackborn
2e47052fc4 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
567722eee1 Merge "Fix problems with determining when to kill apps for wake usage." into gingerbread 2010-08-15 17:33:02 -07:00
Dianne Hackborn
1ebccf531d Fix problems with determining when to kill apps for wake usage.
Also improve debug printing of various times.

Change-Id: Ifcc288fd1bcbf44c069875ba97925b9e7ffe9a48
2010-08-15 17:27:29 -07:00
Irfan Sheriff
6f6203950d 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
f76a05e985 Merge "DO NOT MERGE Fix wifi status icon" into gingerbread 2010-08-15 15:57:47 -07:00
Irfan Sheriff
72d54efd3d DO NOT MERGE Fix wifi status icon
Doing a setIcon makes the icon visible and overrides
setIconVisibility

Change-Id: I7a177cc07e46f211d421e4aa86203ece5936c3fb
2010-08-15 15:55:44 -07:00
James Dong
4fc2c9280c 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
James Dong
b72081966d Use audio clock as the reference media clock
o Only do this for realtime applications
o Adjust other track clock based on audio clock
o Assume other track uses wall clock as the media clock
o Use some heuristics to reduce the size of stts box by 2/3.

- also
o Remove one unused key from MetaData.h

Change-Id: Ib9432842627b61795b533508158c25258a527332
2010-08-13 18:12:48 -07:00
Mathias Agopian
b2c315ebe7 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