Commit Graph

10128 Commits

Author SHA1 Message Date
Daisuke Miyakawa
288e4ec58b am 7798d36a: am d2f813c3: Merge change I60cfe9ce into eclair-mr2
Merge commit '7798d36a4661ac8c88eb47cf0c66d3eeafb2f7a8'

* commit '7798d36a4661ac8c88eb47cf0c66d3eeafb2f7a8':
  Add unit tests.
2009-11-17 18:11:19 -08:00
Jason Sams
6b28431410 resolved conflicts for merge of f6309041 to master 2009-11-17 18:07:54 -08:00
Jaikumar Ganesh
aa4fb9a6de am bc9f6292: am 4fea2919: am 660282dc: Merge change I706fe6b0 into eclair
Merge commit 'bc9f62920aa7cc436cd1934bc7dfa1e9e70cd96d'

* commit 'bc9f62920aa7cc436cd1934bc7dfa1e9e70cd96d':
  Check if Bluetooth is enabled before making any calls down.
2009-11-17 17:45:22 -08:00
Daisuke Miyakawa
16ba214042 am d2f813c3: Merge change I60cfe9ce into eclair-mr2
Merge commit 'd2f813c3f85060d42744be2632fed20f520001ee' into eclair-mr2-plus-aosp

* commit 'd2f813c3f85060d42744be2632fed20f520001ee':
  Add unit tests.
2009-11-17 17:41:17 -08:00
Jason Sams
7d60ef4d3e am f56f317f: am fa0394c9: Merge change I715333b8 into eclair
Merge commit 'f56f317fb941c354c3a10e9fbf36d194656fa7d4' into eclair-mr2-plus-aosp

* commit 'f56f317fb941c354c3a10e9fbf36d194656fa7d4':
  Add support for dumping RS objects to aid in debugging of white blocks bug.
2009-11-17 17:41:02 -08:00
Jaikumar Ganesh
d79d737cb6 am 4fea2919: am 660282dc: Merge change I706fe6b0 into eclair
Merge commit '4fea2919abeba149376fed98a14e3ffc8464eadf' into eclair-mr2-plus-aosp

* commit '4fea2919abeba149376fed98a14e3ffc8464eadf':
  Check if Bluetooth is enabled before making any calls down.
2009-11-17 17:40:45 -08:00
Android (Google) Code Review
1b0e0f1572 Merge change I60cfe9ce into eclair-mr2
* changes:
  Add unit tests.
2009-11-17 17:38:07 -08:00
Jason Sams
561dd7806d am fa0394c9: Merge change I715333b8 into eclair
Merge commit 'fa0394c9f89f13b53c6db2470253825b88cafb64' into eclair-mr2

* commit 'fa0394c9f89f13b53c6db2470253825b88cafb64':
  Add support for dumping RS objects to aid in debugging of white blocks bug.
2009-11-17 17:35:44 -08:00
Jaikumar Ganesh
7c7e00fca6 am 660282dc: Merge change I706fe6b0 into eclair
Merge commit '660282dc3e81784224945be0787a9e2d4276de8c' into eclair-mr2

* commit '660282dc3e81784224945be0787a9e2d4276de8c':
  Check if Bluetooth is enabled before making any calls down.
2009-11-17 17:35:25 -08:00
Android (Google) Code Review
eab3388392 Merge change I715333b8 into eclair
* changes:
  Add support for dumping RS objects to aid in debugging of white blocks bug.
2009-11-17 17:31:58 -08:00
Evan Millar
98d28f8a59 am a6780991: am e53c9a81: am 6bcd99c2: Merge change I1b6d202b into eclair
Merge commit 'a67809918f6c212630da0b359628d0e8722b091f'

* commit 'a67809918f6c212630da0b359628d0e8722b091f':
  Move photo querying off main thread.
2009-11-17 16:14:15 -08:00
Ray Chen
3a07d009d8 am edc1b064: am ae9dd9b7: am b3f35041: Merge change I86db22ef into eclair
Merge commit 'edc1b064ee1da7bca9d9a6114e984962b2633530'

* commit 'edc1b064ee1da7bca9d9a6114e984962b2633530':
  Fix issue 2265955	Use dateCreated when dateTaken isn't valid when writing images/videos to database.
2009-11-17 16:13:57 -08:00
Joe Onorato
56a5789daa am 95230656: am 0036b4de: am df7dbb68: Fix bug 2252145 - Notification panel not closing completely when a call comes in
Merge commit '95230656e46ee7e236f6bb02de1334659a2d1244'

* commit '95230656e46ee7e236f6bb02de1334659a2d1244':
  Fix bug 2252145 - Notification panel not closing completely when a call comes in
2009-11-17 16:13:37 -08:00
Mark Wagner
3901f7b41a am fe537b3f: am 0e3fccf1: Merge change Icef599ec into eclair-mr2
Merge commit 'fe537b3fe4145e3cec41b70b93c366e1c2307ed5'

* commit 'fe537b3fe4145e3cec41b70b93c366e1c2307ed5':
  null check
2009-11-17 16:13:16 -08:00
Android (Google) Code Review
c620009ade Merge change I706fe6b0 into eclair
* changes:
  Check if Bluetooth is enabled before making any calls down.
2009-11-17 16:07:58 -08:00
Evan Millar
1a57b28974 am e53c9a81: am 6bcd99c2: Merge change I1b6d202b into eclair
Merge commit 'e53c9a81e5208bc51ee8e365f19ff867897e63af' into eclair-mr2-plus-aosp

* commit 'e53c9a81e5208bc51ee8e365f19ff867897e63af':
  Move photo querying off main thread.
2009-11-17 16:05:58 -08:00
Ray Chen
b9cad5a3a9 am ae9dd9b7: am b3f35041: Merge change I86db22ef into eclair
Merge commit 'ae9dd9b77d37b430459b55120c13553dc5e67cfc' into eclair-mr2-plus-aosp

* commit 'ae9dd9b77d37b430459b55120c13553dc5e67cfc':
  Fix issue 2265955	Use dateCreated when dateTaken isn't valid when writing images/videos to database.
2009-11-17 16:05:43 -08:00
Joe Onorato
8735851aee am 0036b4de: am df7dbb68: Fix bug 2252145 - Notification panel not closing completely when a call comes in
Merge commit '0036b4def5242429abdf6e8e420896eb5296316e' into eclair-mr2-plus-aosp

* commit '0036b4def5242429abdf6e8e420896eb5296316e':
  Fix bug 2252145 - Notification panel not closing completely when a call comes in
2009-11-17 16:05:27 -08:00
Mark Wagner
1cfb04dc78 am 0e3fccf1: Merge change Icef599ec into eclair-mr2
Merge commit '0e3fccf1a525883aa5d80e10ced5b7af48cfe5a1' into eclair-mr2-plus-aosp

* commit '0e3fccf1a525883aa5d80e10ced5b7af48cfe5a1':
  null check
2009-11-17 16:05:12 -08:00
Andreas Huber
6348efef1b am 39dc5104: am 2c766498: Merge change Iea6a38c6 into eclair-mr2
Merge commit '39dc51040f9b766adaa9ee487bb0568a2ed1c916'

* commit '39dc51040f9b766adaa9ee487bb0568a2ed1c916':
  Squashed commit of the following:
2009-11-17 15:10:44 -08:00
Andreas Huber
22607e2b9e am ed9880f3: am a35f1c63: Merge change Ib64ea2dd into eclair-mr2
Merge commit 'ed9880f399015782c9f635db744d25281d0deeb4'

* commit 'ed9880f399015782c9f635db744d25281d0deeb4':
  Improvements to TimedEventQueue.
2009-11-17 15:10:25 -08:00
Andreas Huber
ba0c9b535f am 775508d9: am 744043fc: Update FileSource to also accept a file descriptor and a range.
Merge commit '775508d97f709e621f9d1540aca819224fbdcebf'

* commit '775508d97f709e621f9d1540aca819224fbdcebf':
  Update FileSource to also accept a file descriptor and a range.
2009-11-17 15:10:07 -08:00
Daisuke Miyakawa
18f3427235 am 50963b1a: am 8c808187: Modify test code a little.
Merge commit '50963b1aa5c2828b46a4e0acf7626b8aef83ef68'

* commit '50963b1aa5c2828b46a4e0acf7626b8aef83ef68':
  Modify test code a little.
2009-11-17 15:08:08 -08:00
Daisuke Miyakawa
19fca3451e am a4d3fae7: am a184d4b9: Merge change I11526e6c into eclair-mr2
Merge commit 'a4d3fae76a5e861df1def65363b244ac4d8889eb'

* commit 'a4d3fae76a5e861df1def65363b244ac4d8889eb':
  Clean up codes and remove/modify stale codes/comments.
2009-11-17 15:07:49 -08:00
Jim Miller
e07b1ca8b0 am 8bf56e6a: am c0b0ad21: am f0166e4d: Merge change I4f01d4a4 into eclair
Merge commit '8bf56e6a1bb842aaae2b8b7630d2bc2711f36bb6'

* commit '8bf56e6a1bb842aaae2b8b7630d2bc2711f36bb6':
  Fix 2209086: Clean up visual glitches in SlidingTab for lock and incall screen.
2009-11-17 15:06:41 -08:00
Daisuke Miyakawa
b69cb11b71 am feef7de2: am ac3e2159: Merge change Icaf78440 into eclair-mr2
Merge commit 'feef7de25b3dc68f1d75c1c2171ddb5bd2169d8c'

* commit 'feef7de25b3dc68f1d75c1c2171ddb5bd2169d8c':
  Split vCard composer into two parts: VCardComposer and VCardBuilder.
2009-11-17 15:06:00 -08:00
Mike Lockwood
099dfa8d33 am 11c89c48: am 0d829149: am f8c4af65: Merge change I51b84496 into eclair
Merge commit '11c89c48281dd75da20b0649e5b6e19b057901eb'

* commit '11c89c48281dd75da20b0649e5b6e19b057901eb':
  Revert "PowerManagerService: enable logging for when mPowerState changes."
2009-11-17 15:05:05 -08:00
Evan Millar
3efad8d3bd am 6bcd99c2: Merge change I1b6d202b into eclair
Merge commit '6bcd99c2a63338254c68e27e40e5395cbdd3e1ef' into eclair-mr2

* commit '6bcd99c2a63338254c68e27e40e5395cbdd3e1ef':
  Move photo querying off main thread.
2009-11-17 14:45:13 -08:00
Android (Google) Code Review
2ea3e7f3d2 Merge change I1b6d202b into eclair
* changes:
  Move photo querying off main thread.
2009-11-17 14:40:40 -08:00
Ray Chen
e56a482107 am b3f35041: Merge change I86db22ef into eclair
Merge commit 'b3f35041aa50839e5d8ed3a4ad72e6eef2cb4ea6' into eclair-mr2

* commit 'b3f35041aa50839e5d8ed3a4ad72e6eef2cb4ea6':
  Fix issue 2265955	Use dateCreated when dateTaken isn't valid when writing images/videos to database.
2009-11-17 14:28:18 -08:00
Android (Google) Code Review
db0438250f Merge change I86db22ef into eclair
* changes:
  Fix issue 2265955	Use dateCreated when dateTaken isn't valid when writing images/videos to database.
2009-11-17 14:23:36 -08:00
Joe Onorato
3a060fa251 am df7dbb68: Fix bug 2252145 - Notification panel not closing completely when a call comes in
Merge commit 'df7dbb68d330eae88c1ca6d03390dc8c18386871' into eclair-mr2

* commit 'df7dbb68d330eae88c1ca6d03390dc8c18386871':
  Fix bug 2252145 - Notification panel not closing completely when a call comes in
2009-11-17 14:10:12 -08:00
Android (Google) Code Review
d1c277e9b1 Merge change Icef599ec into eclair-mr2
* changes:
  null check
2009-11-17 14:09:14 -08:00
Scott Main
bffddec061 resolved conflicts for merge of bc1add83 to master 2009-11-17 11:13:31 -08:00
Andreas Huber
235ca57a64 am 2c766498: Merge change Iea6a38c6 into eclair-mr2
Merge commit '2c7664989f7388c0c6cf0ec7d80ffa2704c8c2be' into eclair-mr2-plus-aosp

* commit '2c7664989f7388c0c6cf0ec7d80ffa2704c8c2be':
  Squashed commit of the following:
2009-11-17 10:50:22 -08:00
Android (Google) Code Review
2643a859b5 Merge change Iea6a38c6 into eclair-mr2
* changes:
  Squashed commit of the following:
2009-11-17 10:46:41 -08:00
Andreas Huber
7c93ee5f29 am a35f1c63: Merge change Ib64ea2dd into eclair-mr2
Merge commit 'a35f1c63a67df0832d9b3f1aed3e2376367d4398' into eclair-mr2-plus-aosp

* commit 'a35f1c63a67df0832d9b3f1aed3e2376367d4398':
  Improvements to TimedEventQueue.
2009-11-17 10:40:59 -08:00
Andreas Huber
0f7fee8890 am 744043fc: Update FileSource to also accept a file descriptor and a range.
Merge commit '744043fcbf48c32c2051f222eca552fa2df5dfcb' into eclair-mr2-plus-aosp

* commit '744043fcbf48c32c2051f222eca552fa2df5dfcb':
  Update FileSource to also accept a file descriptor and a range.
2009-11-17 10:36:27 -08:00
Android (Google) Code Review
8c655076d4 Merge change Ib64ea2dd into eclair-mr2
* changes:
  Improvements to TimedEventQueue.
2009-11-17 10:36:24 -08:00
Mike Cleron
c81cfdc001 am e5b5aa49: am fd5cfd88: am f36b8f43: Merge change Ia428b2c2 into eclair
Merge commit 'e5b5aa490372099c3541e51b8ed260cf9280247d'

* commit 'e5b5aa490372099c3541e51b8ed260cf9280247d':
  This time for sure: make wallpapers work
2009-11-17 07:38:08 -08:00
Dianne Hackborn
f0b1ec189e am fe11d1a7: am 43e9eb28: am 9ddb7df8: Fix build.
Merge commit 'fe11d1a7a5480737c9331531592d4c70f374198e'

* commit 'fe11d1a7a5480737c9331531592d4c70f374198e':
  Fix build.
2009-11-17 07:37:47 -08:00
Adam Bliss
40ccdc3d97 am 1ff57418: am 34073369: am 69e0b664: Merge change I000d3564 into eclair
Merge commit '1ff57418a7d58887301766031554a146c1ededd1'

* commit '1ff57418a7d58887301766031554a146c1ededd1':
  Move map tiles to no-dpi since they are dpi-independent.
2009-11-17 07:37:28 -08:00
Dianne Hackborn
91ab6cdbf3 am 003ac2c8: am beaf87bf: am 60d7db4c: Fix #2262593: 42 ANR reports from android.process.acore
Merge commit '003ac2c8e9a684a28180dac01340c759bf321cfd'

* commit '003ac2c8e9a684a28180dac01340c759bf321cfd':
  Fix #2262593: 42 ANR reports from android.process.acore
2009-11-17 07:37:08 -08:00
Dianne Hackborn
dd3db14992 am 3a624abe: am 92b18800: am ab5efde8: Merge change Iff5b8ce3 into eclair
Merge commit '3a624abe2735168d288bf905ab9cb8ca60a77be5'

* commit '3a624abe2735168d288bf905ab9cb8ca60a77be5':
  Work on issue 2259506: camera ANRed and then device runtime restarted
2009-11-17 07:36:47 -08:00
Jack Palevich
72f3641cba am 8d0e1472: am a822f02b: resolved conflicts for merge of dc49acb0 to eclair-mr2
Merge commit '8d0e14723312a9f8286ba95cc559ee000eab1b82'

* commit '8d0e14723312a9f8286ba95cc559ee000eab1b82':
  More GLSurfaceView cleanup.
2009-11-17 07:34:53 -08:00
Jack Wang
c57c02061f am e5fa335b: am 6e045e0a: am e0cadd7c: Merge change Iffbb6e55 into eclair
Merge commit 'e5fa335b0dffbd06385b6de05ae04b2bd2ea277e'

* commit 'e5fa335b0dffbd06385b6de05ae04b2bd2ea277e':
  Make perf metrics collection & output via instrumentation simpler
2009-11-17 07:33:59 -08:00
Mathias Agopian
cdcc59a38b am af3e233f: am fc36afcb: am f998c4a2: Merge change I1c0bebbc into eclair
Merge commit 'af3e233fe3222990440433d5f90a6a310d0170e3'

* commit 'af3e233fe3222990440433d5f90a6a310d0170e3':
  fix [2262591] Junk on screen in ERD46
2009-11-17 07:33:19 -08:00
Jeff Sharkey
b5dec27eab am 35d85700: am 8059bcbf: resolved conflicts for merge of 1162fd77 to eclair-mr2
Merge commit '35d857002dcbc24d05a0f9d157ce8ee1927ae235'

* commit '35d857002dcbc24d05a0f9d157ce8ee1927ae235':
  Let RemoteViews nest children, allow ViewFlipper.
2009-11-17 07:32:55 -08:00
Jason Sams
85a53c0984 am 234e509a: am 22186a2c: am ec8178eb: Merge change I9c1bad53 into eclair
Merge commit '234e509a67eb32606f3051d21eb3ea25b272d80d'

* commit '234e509a67eb32606f3051d21eb3ea25b272d80d':
  Add setPriority to allow wallpapers to run at lower cpu priority than default.
2009-11-17 07:31:07 -08:00
Daisuke Miyakawa
b9ac343865 am d557614f: am f016fa63: Merge change Ib1f7c3cb into eclair-mr2
Merge commit 'd557614f3a8b5e25c9e1160bb28b4bdc7850c1c2'

* commit 'd557614f3a8b5e25c9e1160bb28b4bdc7850c1c2':
  Make vCard composer use Base64 class for encoding String into bytes instead of using its own implementation.
2009-11-17 07:30:43 -08:00