30332 Commits

Author SHA1 Message Date
James Dong
46e63b3467 Merge "Better file size estimate" into gingerbread 2010-09-03 09:53:13 -07:00
Maksymilian Osowski
94cba5b2a2 Merge "Fixed the run_apache2.py script to use the correct mime.types file." 2010-09-03 09:49:51 -07:00
Kenny Root
305bcbf0c9 Decrease PackageManagerService wait time for vold
Up the blocking queue maximum to twice the number of containers we
allow which should let "asec list" complete without blocking the thread
several times.

Change the threads for the NativeDaemonConnector to vold and netd to be
more descriptive instead of the same name.

Bug: 2501075
Change-Id: I7e7949845a6c70a3d619aec0fa79ceef3c17a4be
2010-09-03 09:33:34 -07:00
Maksymilian Osowski
5846d4561d Fixed the run_apache2.py script to use the correct mime.types file.
Change-Id: I0bd5870259b3f7de92d4996d1ebb83fdff126210
2010-09-03 17:03:33 +01:00
Leon Scroggins III
e742c08ce0 Use the proper selection when performing a delete.
Bug: 2956964

Change-Id: I488c291b2fb3cfa5c5d510bd4a03afbc8949d8d8
2010-09-03 11:45:28 -04:00
Wink Saville
de7fb55369 Merge "Fix and simplify ConnectivityService singleton." 2010-09-03 08:16:30 -07:00
Bjorn Bringert
c4b0598239 Merge "Test for decoding Bitmap from MemoryFile ParcelFileDescriptor" 2010-09-03 02:27:05 -07:00
Kenny Root
1d5c87b753 am fb79b7da: am 12da9d74: Fix buffer compacting in NativeDaemonConnector
Merge commit 'fb79b7dab3ccaf490e8cbb18c9feed7080e4b54f'

* commit 'fb79b7dab3ccaf490e8cbb18c9feed7080e4b54f':
  Fix buffer compacting in NativeDaemonConnector
2010-09-02 22:32:39 -07:00
Kenny Root
fb79b7dab3 am 12da9d74: Fix buffer compacting in NativeDaemonConnector
Merge commit '12da9d7472ae87b841575d5358e19f143d12f900' into gingerbread-plus-aosp

* commit '12da9d7472ae87b841575d5358e19f143d12f900':
  Fix buffer compacting in NativeDaemonConnector
2010-09-02 22:29:05 -07:00
Kenny Root
12da9d7472 Fix buffer compacting in NativeDaemonConnector
The buffer was being compacted in the read loop, but the start offset on
the compacted buffer wasn't being considered after the next read.

Bug: 2501075
Change-Id: I163297d751cf800d0bbc66df66b1a0fa0785de49
2010-09-02 22:24:06 -07:00
James Dong
cb7e65c6cb Better file size estimate
When the recorded file becomes large, the metadata size can
no longer be ignored. This makes it possible to save the
recorded file when the storage becomes almost full at the
end of the recording session.

Change-Id: Ief038080f825c9946ce550949c03e914aec1e31a
2010-09-02 20:10:00 -07:00
Hung-ying Tyan
3559d1d1fc am ea16e72b: am b355714a: Merge "SipManager: always return true for SIP API and VOIP support query." into gingerbread
Merge commit 'ea16e72bff350c0b6e2a00a82b934d1a2fc0fa2d'

* commit 'ea16e72bff350c0b6e2a00a82b934d1a2fc0fa2d':
  SipManager: always return true for SIP API and VOIP support query.
2010-09-02 19:30:16 -07:00
Hung-ying Tyan
ea16e72bff am b355714a: Merge "SipManager: always return true for SIP API and VOIP support query." into gingerbread
Merge commit 'b355714a2995ebe343808e06f69da5067f52a833' into gingerbread-plus-aosp

* commit 'b355714a2995ebe343808e06f69da5067f52a833':
  SipManager: always return true for SIP API and VOIP support query.
2010-09-02 19:26:56 -07:00
Wink Saville
bb08caf54b Fix and simplify ConnectivityService singleton.
Change-Id: Idb74854db9d801c1cc138eb5ca866cf01940ff6d
2010-09-02 19:23:52 -07:00
Hung-ying Tyan
b355714a29 Merge "SipManager: always return true for SIP API and VOIP support query." into gingerbread 2010-09-02 19:23:31 -07:00
Hung-ying Tyan
643fce9781 SipManager: always return true for SIP API and VOIP support query.
Change-Id: I397a804e0aa598aee77a8ce28ada1b11e10fbaea
http://b/issue?id=2972054
2010-09-03 10:19:23 +08:00
Scott Main
b433298530 am beccf3c4: am 3208557e: am c5083cdf: Merge "clarify dp dimension description" into froyo
Merge commit 'beccf3c48a6573da6dc0cb3d5e8e170664220f0c'

* commit 'beccf3c48a6573da6dc0cb3d5e8e170664220f0c':
  clarify dp dimension description
2010-09-02 18:53:32 -07:00
James Dong
9f20d3328f am bb64e554: am 7ed7668b: Merge "Calculate audio media drift time from AudioSource" into gingerbread
Merge commit 'bb64e554d9a28fcf8eebf579e91ff71b8ffef1e3'

* commit 'bb64e554d9a28fcf8eebf579e91ff71b8ffef1e3':
  Calculate audio media drift time from AudioSource
2010-09-02 18:51:05 -07:00
Scott Main
beccf3c48a am 3208557e: am c5083cdf: Merge "clarify dp dimension description" into froyo
Merge commit '3208557edca8c133fa32b7718acd22d77f1a9475' into gingerbread-plus-aosp

* commit '3208557edca8c133fa32b7718acd22d77f1a9475':
  clarify dp dimension description
2010-09-02 18:44:11 -07:00
Alex Sakhartchouk
caaac0f827 Fixing fragment shader bounding code
Change-Id: I743dae12bb3f226f758a065d9b353eff36e2f964
2010-09-02 18:43:24 -07:00
James Dong
bb64e554d9 am 7ed7668b: Merge "Calculate audio media drift time from AudioSource" into gingerbread
Merge commit '7ed7668b30e70ca8e3f0f183364433326ed29f39' into gingerbread-plus-aosp

* commit '7ed7668b30e70ca8e3f0f183364433326ed29f39':
  Calculate audio media drift time from AudioSource
2010-09-02 18:41:49 -07:00
Scott Main
3208557edc am c5083cdf: Merge "clarify dp dimension description" into froyo
Merge commit 'c5083cdfff55a8fdcc82198273afd7dbe6379879' into gingerbread

* commit 'c5083cdfff55a8fdcc82198273afd7dbe6379879':
  clarify dp dimension description
2010-09-02 18:30:16 -07:00
James Dong
7ed7668b30 Merge "Calculate audio media drift time from AudioSource" into gingerbread 2010-09-02 18:24:21 -07:00
Adam Powell
f52faefce8 Merge "Make spinnerMode attribute for Spinner widgets public" 2010-09-02 18:12:07 -07:00
Adam Powell
d477176d3f Make spinnerMode attribute for Spinner widgets public
Change-Id: Ib448f8511cc7ff92ad8120a891ccaa8cdde6c9dc
2010-09-02 18:07:49 -07:00
Dianne Hackborn
f156e752b5 am 31103928: am 192b56d4: Merge "Implement #2964234: Add support for <uses-package> element to aapt" into gingerbread
Merge commit '31103928ed5b9091bcd7de74c8a49675d10c87e7'

* commit '31103928ed5b9091bcd7de74c8a49675d10c87e7':
  Implement #2964234: Add support for <uses-package> element to aapt
2010-09-02 17:59:51 -07:00
Scott Main
c5083cdfff Merge "clarify dp dimension description" into froyo 2010-09-02 17:53:14 -07:00
Dianne Hackborn
31103928ed am 192b56d4: Merge "Implement #2964234: Add support for <uses-package> element to aapt" into gingerbread
Merge commit '192b56d42a4f6e5e6c736b0f22dd5bd201b02c9d' into gingerbread-plus-aosp

* commit '192b56d42a4f6e5e6c736b0f22dd5bd201b02c9d':
  Implement #2964234: Add support for <uses-package> element to aapt
2010-09-02 17:36:37 -07:00
Dianne Hackborn
192b56d42a Merge "Implement #2964234: Add support for <uses-package> element to aapt" into gingerbread 2010-09-02 17:34:31 -07:00
Adam Powell
0a01f076d2 Merge "Fix bug 2963261" 2010-09-02 17:19:44 -07:00
Dianne Hackborn
43b6803095 Implement #2964234: Add support for <uses-package> element to aapt
Change-Id: Ifb381f387cab7e5a99006691e330d0e3d9d0f250
2010-09-02 17:14:41 -07:00
Adam Powell
cdee446075 Fix bug 2963261
Change-Id: I31952474cf9d31fff78436461aeb7d0ad34d9068
2010-09-02 17:13:24 -07:00
John Wang
20bb22964e Add API to get all foreground calls.
Change-Id: I38293b2d7841f5d8708a7b9b516f686ab15de2b1
2010-09-02 17:12:28 -07:00
Erik
47c41e807e Added methods for getting the x and y span
We would like to separate x and y for our pinch gestures. This
change adds methods for returning those independently instead of
only allowing access to the total span.

Change-Id: I2f54cd83602e447174a49035237da379a573b63e
2010-09-02 17:10:02 -07:00
Adam Powell
18931f578e Merge "Fix bug 2957414 - Add Spinner constructor for selecting dialog/dropdown mode" 2010-09-02 16:00:41 -07:00
Adam Powell
fef364f75b Fix bug 2957414 - Add Spinner constructor for selecting dialog/dropdown mode
Change-Id: I7ea2bbf7d387bdd3e0cb59a1b9b24406560680b7
2010-09-02 15:56:04 -07:00
Kenny Root
8716030747 am 8d5250c6: am 2e246549: Merge "Add better debug output for ResourceType errors" into gingerbread
Merge commit '8d5250c601504da7a7fde3a3fd7b1c51335becdf'

* commit '8d5250c601504da7a7fde3a3fd7b1c51335becdf':
  Add better debug output for ResourceType errors
2010-09-02 15:53:26 -07:00
Kenny Root
8d5250c601 am 2e246549: Merge "Add better debug output for ResourceType errors" into gingerbread
Merge commit '2e2465497c08061cccf4908e49095f2d19a35eea' into gingerbread-plus-aosp

* commit '2e2465497c08061cccf4908e49095f2d19a35eea':
  Add better debug output for ResourceType errors
2010-09-02 15:48:49 -07:00
Kenny Root
2e2465497c Merge "Add better debug output for ResourceType errors" into gingerbread 2010-09-02 15:45:52 -07:00
Gilles Debunne
355a17c4f8 am ece9e194: am d180232e: Merge "Revert "Merge "InputMethodManager showSoftInput return documentation." into gingerbread"" into gingerbread
Merge commit 'ece9e1947831a46b5d67b1a3d3d8e0189e38d983'

* commit 'ece9e1947831a46b5d67b1a3d3d8e0189e38d983':
  Revert "Merge "InputMethodManager showSoftInput return documentation." into gingerbread"
2010-09-02 15:39:55 -07:00
Irfan Sheriff
ee923072eb Merge "Add set/get band in WifiNative" 2010-09-02 15:39:16 -07:00
Gilles Debunne
ece9e19478 am d180232e: Merge "Revert "Merge "InputMethodManager showSoftInput return documentation." into gingerbread"" into gingerbread
Merge commit 'd180232e92b78067beb7f84d7f3d1d21865f0594' into gingerbread-plus-aosp

* commit 'd180232e92b78067beb7f84d7f3d1d21865f0594':
  Revert "Merge "InputMethodManager showSoftInput return documentation." into gingerbread"
2010-09-02 15:34:24 -07:00
Gilles Debunne
d180232e92 Merge "Revert "Merge "InputMethodManager showSoftInput return documentation." into gingerbread"" into gingerbread 2010-09-02 15:29:14 -07:00
Gilles Debunne
d4723bb415 Revert "Merge "InputMethodManager showSoftInput return documentation." into gingerbread"
This reverts commit 26d708d93624d2d060529b7e33e0a20172e85efd, reversing
changes made to 3ac85d31de6cab5a468b7728b3340cf1b57bc8fe.

Change-Id: Ifc19f837bee7437707ddddf0b19cb6bce53dd2c5
2010-09-02 15:27:47 -07:00
Eric Rowe
572031747f am 4ca550a1: am 947e25e5: am ac3c1f55: Add BT test instrumentation for reboot tests.
Merge commit '4ca550a17b8becdf6b5a32909fb5c70ef7579f4e'

* commit '4ca550a17b8becdf6b5a32909fb5c70ef7579f4e':
  Add BT test instrumentation for reboot tests.
2010-09-02 15:03:12 -07:00
Dan Morrill
5e6e977c70 Merge "Adding features for new hardware, and creating a baseline list of required hardware for the Tablet profile. This is very much subject to change." 2010-09-02 15:01:31 -07:00
Dan Morrill
1675062342 Adding features for new hardware, and creating a baseline list of required
hardware for the Tablet profile. This is very much subject to change.

Change-Id: Id0921b373cf610a7ec9ddd75dc020bf8b22a6911
2010-09-02 15:00:19 -07:00
Gilles Debunne
25962adc73 am 5402c34b: am 26d708d9: Merge "InputMethodManager showSoftInput return documentation." into gingerbread
Merge commit '5402c34b2717fd4885782a8fc631b3b66162d140'

* commit '5402c34b2717fd4885782a8fc631b3b66162d140':
  InputMethodManager showSoftInput return documentation.
2010-09-02 14:59:58 -07:00
Eric Rowe
4ca550a17b am 947e25e5: am ac3c1f55: Add BT test instrumentation for reboot tests.
Merge commit '947e25e5ffe13549dab82580ef05f1f4faf42cd2' into gingerbread-plus-aosp

* commit '947e25e5ffe13549dab82580ef05f1f4faf42cd2':
  Add BT test instrumentation for reboot tests.
2010-09-02 14:59:00 -07:00
Kenny Root
68c2e915fd Add better debug output for ResourceType errors
An error code is returned as -ESOMETHING, but the debug code was
printing out 0x%08x for these codes making -74 print out as 0xffffffb5
which is kind of silly.

Change-Id: I7d77fb3da2e146845949f121404f662b47288e61
2010-09-02 14:58:47 -07:00