Commit Graph

7191 Commits

Author SHA1 Message Date
Jean-Michel Trivi
00239da87e am aab31d93: am 4813b51e: Merge change 22838 into eclair
Merge commit 'aab31d933b67eac6f8c6abfa07655bd6d4712b51'

* commit 'aab31d933b67eac6f8c6abfa07655bd6d4712b51':
  Implement clean killing of the TTS service.
2009-08-26 17:22:13 -07:00
Jean-Michel Trivi
aab31d933b am 4813b51e: Merge change 22838 into eclair
Merge commit '4813b51ec7f9f485a9f98583d4a90ca3d1bed6f7' into eclair-plus-aosp

* commit '4813b51ec7f9f485a9f98583d4a90ca3d1bed6f7':
  Implement clean killing of the TTS service.
2009-08-26 17:20:12 -07:00
Android (Google) Code Review
4813b51ec7 Merge change 22838 into eclair
* changes:
  Implement clean killing of the TTS service. If files were being synthesized to while the service was being killed, it would have left partially written files (with no header). This CL checks if the service is rendering to a file at the time the service is destroyed: if it is, it will stop the rendering and deletes the file.
2009-08-26 17:18:47 -07:00
San Mehat
69cda5a080 am 8c9e1a4f: am 1339614e: Merge change 22839 into eclair
Merge commit '8c9e1a4fc4b6585ce96451b36a7253812c1b80ae'

* commit '8c9e1a4fc4b6585ce96451b36a7253812c1b80ae':
  dumpstate: Get last_kmsg from /data instead of /proc.
2009-08-26 17:15:28 -07:00
San Mehat
8c9e1a4fc4 am 1339614e: Merge change 22839 into eclair
Merge commit '1339614e67ff81b22d961e10d39f36118c536752' into eclair-plus-aosp

* commit '1339614e67ff81b22d961e10d39f36118c536752':
  dumpstate: Get last_kmsg from /data instead of /proc.
2009-08-26 17:13:26 -07:00
Android (Google) Code Review
1339614e67 Merge change 22839 into eclair
* changes:
  dumpstate: Get last_kmsg from /data instead of /proc.
2009-08-26 17:11:23 -07:00
Jean-Michel Trivi
a3046b6f7f Implement clean killing of the TTS service.
If files were being synthesized to while the service was being killed,
it would have left partially written files (with no header). This CL
checks if the service is rendering to a file at the time the service
is destroyed: if it is, it will stop the rendering and deletes the file.
2009-08-26 17:06:52 -07:00
San Mehat
bc7bba419d dumpstate: Get last_kmsg from /data instead of /proc.
Signed-off-by: San Mehat <san@google.com>
2009-08-26 16:43:08 -07:00
Sanjay Jeyakumar
6f95bf9c68 am 18a555be: am b89c9d42: Merge change 22826 into eclair
Merge commit '18a555be9a8ea5238f42c6967564d6bcc5afcb7b'

* commit '18a555be9a8ea5238f42c6967564d6bcc5afcb7b':
  Add Gservices setting for the frequency to perform provisioning.
2009-08-26 16:38:59 -07:00
Sanjay Jeyakumar
18a555be9a am b89c9d42: Merge change 22826 into eclair
Merge commit 'b89c9d422781d10c614af61b1519daed2b9086e2' into eclair-plus-aosp

* commit 'b89c9d422781d10c614af61b1519daed2b9086e2':
  Add Gservices setting for the frequency to perform provisioning.
2009-08-26 16:36:57 -07:00
Android (Google) Code Review
b89c9d4227 Merge change 22826 into eclair
* changes:
  Add Gservices setting for the frequency to perform provisioning.
2009-08-26 16:34:13 -07:00
Sanjay Jeyakumar
ebd8416fad Add Gservices setting for the frequency to perform provisioning. 2009-08-26 16:01:08 -07:00
Scott Main
e45ade0f03 am c59bac1a: am 1b856974: Merge change 22822 into eclair
Merge commit 'c59bac1a2a9cded00ccd9f456ec065e6a9dc6055'

* commit 'c59bac1a2a9cded00ccd9f456ec065e6a9dc6055':
  docs only.
2009-08-26 15:34:44 -07:00
Scott Main
c59bac1a2a am 1b856974: Merge change 22822 into eclair
Merge commit '1b856974617cb88202cdfe28bdcf43a939fa47be' into eclair-plus-aosp

* commit '1b856974617cb88202cdfe28bdcf43a939fa47be':
  docs only.
2009-08-26 15:32:49 -07:00
Android (Google) Code Review
1b85697461 Merge change 22822 into eclair
* changes:
  resolved conflicts for merge of b0f5b755 to eclair
2009-08-26 15:31:09 -07:00
Scott Main
87b9055252 resolved conflicts for merge of b0f5b755 to eclair 2009-08-26 15:29:03 -07:00
Andreas Huber
5581e55289 am 26795e6c: am 2d829928: Merge change 22818 into eclair
Merge commit '26795e6c40f3f96a6b5fcd4434b7603a6e0fed4b'

* commit '26795e6c40f3f96a6b5fcd4434b7603a6e0fed4b':
  assert => CHECK in stagefright.
2009-08-26 15:22:18 -07:00
Andreas Huber
26795e6c40 am 2d829928: Merge change 22818 into eclair
Merge commit '2d829928792f99f9cf44ca5d9d1c1eb6cb771c5a' into eclair-plus-aosp

* commit '2d829928792f99f9cf44ca5d9d1c1eb6cb771c5a':
  assert => CHECK in stagefright.
2009-08-26 15:20:25 -07:00
Android (Google) Code Review
2d82992879 Merge change 22818 into eclair
* changes:
  assert => CHECK in stagefright.
2009-08-26 15:18:21 -07:00
Andreas Huber
b5ceb9ee21 assert => CHECK in stagefright. 2009-08-26 14:48:20 -07:00
Nick Pelly
cc7ce55d0c am 3453e862: am 993844bd: Merge change 22806 into eclair
Merge commit '3453e862fe13648608e14a17723eb6cd3b55065a'

* commit '3453e862fe13648608e14a17723eb6cd3b55065a':
  Add trailing "\n" to debug output.
2009-08-26 14:17:58 -07:00
Nick Pelly
3453e862fe am 993844bd: Merge change 22806 into eclair
Merge commit '993844bde5270f004aa504c879aa2e99b5c3765f' into eclair-plus-aosp

* commit '993844bde5270f004aa504c879aa2e99b5c3765f':
  Add trailing "\n" to debug output.
2009-08-26 14:16:11 -07:00
Evan Millar
2c0a921598 am 84184d61: am c4ba7e39: Merge change 22772 into eclair
Merge commit '84184d618c5a247a186e1f4bd72f6b52af18ee76'

* commit '84184d618c5a247a186e1f4bd72f6b52af18ee76':
  New List and Tab assets.
2009-08-26 14:14:33 -07:00
Nick Pelly
0dbff40dee am 768c6e83: am b078d6ef: Merge change 22803 into eclair
Merge commit '768c6e835c73b56ce5d10e5f81bfbe4990922d13'

* commit '768c6e835c73b56ce5d10e5f81bfbe4990922d13':
  Add uuids to adb shell dumpsys bluetooth
2009-08-26 14:14:29 -07:00
Android (Google) Code Review
993844bde5 Merge change 22806 into eclair
* changes:
  Add trailing "\n" to debug output.
2009-08-26 14:13:55 -07:00
Evan Millar
84184d618c am c4ba7e39: Merge change 22772 into eclair
Merge commit 'c4ba7e39f1588604c0ae1e117e35b8413619abac' into eclair-plus-aosp

* commit 'c4ba7e39f1588604c0ae1e117e35b8413619abac':
  New List and Tab assets.
2009-08-26 14:12:48 -07:00
Nick Pelly
768c6e835c am b078d6ef: Merge change 22803 into eclair
Merge commit 'b078d6ef7c83df156ff2f6bac48df26a2766bf5d' into eclair-plus-aosp

* commit 'b078d6ef7c83df156ff2f6bac48df26a2766bf5d':
  Add uuids to adb shell dumpsys bluetooth
2009-08-26 14:12:44 -07:00
Nick Pelly
b015e193b7 Add trailing "\n" to debug output. 2009-08-26 14:11:24 -07:00
Android (Google) Code Review
c4ba7e39f1 Merge change 22772 into eclair
* changes:
  New List and Tab assets.
2009-08-26 14:10:19 -07:00
Android (Google) Code Review
b078d6ef7c Merge change 22803 into eclair
* changes:
  Add uuids to adb shell dumpsys bluetooth
2009-08-26 14:07:41 -07:00
Nick Pelly
9e4526e6c6 am 7cdbd393: am d41c5776: Merge change 22768 into eclair
Merge commit '7cdbd393efc47dd10b7e61e777752be932c00eb9'

* commit '7cdbd393efc47dd10b7e61e777752be932c00eb9':
  Fix authorization check for Audio Source.
2009-08-26 14:07:04 -07:00
Nick Pelly
7cdbd393ef am d41c5776: Merge change 22768 into eclair
Merge commit 'd41c577684785eecd3ffa848aafae759e5889731' into eclair-plus-aosp

* commit 'd41c577684785eecd3ffa848aafae759e5889731':
  Fix authorization check for Audio Source.
2009-08-26 14:05:20 -07:00
Android (Google) Code Review
d41c577684 Merge change 22768 into eclair
* changes:
  Fix authorization check for Audio Source.
2009-08-26 14:03:15 -07:00
Android (Google) Code Review
b0f5b755e7 Merge change 22090 into donut
* changes:
      docs only.     add new documentation for installing the new winusb driver.     also add a link to the HTC support site for ADP flashing     and remove references to the G1 and generalize to "consumer devices"
2009-08-26 12:55:54 -07:00
Mike Lockwood
8926a6cb69 am 98709530: am 23b1a470: Merge change 22769 into eclair
Merge commit '98709530d9cee07460c87ad154bf994dc7b61553'

* commit '98709530d9cee07460c87ad154bf994dc7b61553':
  MountService: Launch UsbStorageActivity with Intent.FLAG_ACTIVITY_NEW_TASK flag.
2009-08-26 12:30:29 -07:00
Mike Lockwood
98709530d9 am 23b1a470: Merge change 22769 into eclair
Merge commit '23b1a470081e6b3c56ada4c43863ca7ed48c3ad2' into eclair-plus-aosp

* commit '23b1a470081e6b3c56ada4c43863ca7ed48c3ad2':
  MountService: Launch UsbStorageActivity with Intent.FLAG_ACTIVITY_NEW_TASK flag.
2009-08-26 12:27:51 -07:00
Android (Google) Code Review
23b1a47008 Merge change 22769 into eclair
* changes:
  MountService: Launch UsbStorageActivity with Intent.FLAG_ACTIVITY_NEW_TASK flag.
2009-08-26 12:25:55 -07:00
Scott Main
7991745ea0 docs only.
add new documentation for installing the new winusb driver.
    also add a link to the HTC support site for ADP flashing
    and remove references to the G1 and generalize to "consumer devices"
2009-08-26 11:56:57 -07:00
Fred Quintana
43a333a07e am f500d64a: am 2d5a14d6: Merge change 22732 into eclair
Merge commit 'f500d64a75cb4b593756f38043c47134fdc316bf'

* commit 'f500d64a75cb4b593756f38043c47134fdc316bf':
  clean up the too many deletes dialog
2009-08-26 11:52:09 -07:00
Fred Quintana
f500d64a75 am 2d5a14d6: Merge change 22732 into eclair
Merge commit '2d5a14d6bf2bbc5a7e895cd4a0b977dd2f297532' into eclair-plus-aosp

* commit '2d5a14d6bf2bbc5a7e895cd4a0b977dd2f297532':
  clean up the too many deletes dialog
2009-08-26 11:49:35 -07:00
Bjorn Bringert
df40a75249 am 70419aa4: am 98d88588: am ba223760: Close suggestion cursors that arrive after adapter is closed
Merge commit '70419aa4bb06ab62aa185f0999a578f36708e1e6'

* commit '70419aa4bb06ab62aa185f0999a578f36708e1e6':
  Close suggestion cursors that arrive after adapter is closed
2009-08-26 11:47:41 -07:00
Android (Google) Code Review
2d5a14d6bf Merge change 22732 into eclair
* changes:
  clean up the too many deletes dialog
2009-08-26 11:47:20 -07:00
Bjorn Bringert
70419aa4bb am 98d88588: am ba223760: Close suggestion cursors that arrive after adapter is closed
Merge commit '98d8858890227861c5dc28bc7acee9b1adedda45' into eclair-plus-aosp

* commit '98d8858890227861c5dc28bc7acee9b1adedda45':
  Close suggestion cursors that arrive after adapter is closed
2009-08-26 11:44:09 -07:00
Bjorn Bringert
98d8858890 am ba223760: Close suggestion cursors that arrive after adapter is closed
Merge commit 'ba223760895e62ad2fcb85476984cb29018860c9' into eclair

* commit 'ba223760895e62ad2fcb85476984cb29018860c9':
  Close suggestion cursors that arrive after adapter is closed
2009-08-26 11:41:40 -07:00
Nick Pelly
1eada0d3d6 Add uuids to adb shell dumpsys bluetooth 2009-08-26 10:57:33 -07:00
Evan Millar
3730bb1cd5 New List and Tab assets.
New tab assets. We decided to do a straight swap and then assess the
damage.

New default dark background color.

New list divider assets.

Change-Id: Ia00a9bb0ee1bad4f955f1c3b5b67526f62572015
2009-08-26 10:56:45 -07:00
Nick Pelly
b23d4458a9 Fix authorization check for Audio Source.
Bluez sends the UUID of the local service being accessed in Agent.Authorize,
not the remote service. So check for Audio Source not Audio Sink.

In most cases this was not a problem because Bluez sends us AdvAudioDist UUID
(0x110D) for incoming A2DP connections, which we already check for. This is a
precautionary change.
2009-08-26 10:46:37 -07:00
Andreas Huber
7b8e131498 am 57fff7f6: am 4b8e3fb5: Merge change 22777 into eclair
Merge commit '57fff7f619385791152bcd0143dfcd3a970638f1'

* commit '57fff7f619385791152bcd0143dfcd3a970638f1':
  Disregard the EOS buffer flag while flushing or shutting down the decoder.
2009-08-26 10:42:29 -07:00
Andreas Huber
57fff7f619 am 4b8e3fb5: Merge change 22777 into eclair
Merge commit '4b8e3fb51155ab6c990803ff7780cd1b8c8f3dcf' into eclair-plus-aosp

* commit '4b8e3fb51155ab6c990803ff7780cd1b8c8f3dcf':
  Disregard the EOS buffer flag while flushing or shutting down the decoder.
2009-08-26 10:40:33 -07:00
Android (Google) Code Review
4b8e3fb511 Merge change 22777 into eclair
* changes:
  Disregard the EOS buffer flag while flushing or shutting down the decoder.
2009-08-26 10:38:53 -07:00