Jaikumar Ganesh
8f9c21780b
am d4d2ba80: Merge "Fix crash while connecting channel."
...
* commit 'd4d2ba8037b3262d01ba26a7fe007e86a38b1ab1':
Fix crash while connecting channel.
2011-09-09 09:01:37 -07:00
Jaikumar Ganesh
3bed2b1383
am cedd4608: Merge "Make Bluetooth Health APIs public."
...
* commit 'cedd460820ffc3e88fdac5926baf588279c38b6f':
Make Bluetooth Health APIs public.
2011-09-09 09:01:27 -07:00
Romain Guy
0e75168920
am 8312b20d: Merge "Save/restore display lists\' canvas properly"
...
* commit '8312b20d83b3ce886485c14f7ec5c8b45056a62f':
Save/restore display lists' canvas properly
2011-09-09 09:01:08 -07:00
Jaikumar Ganesh
d4d2ba8037
Merge "Fix crash while connecting channel."
2011-09-08 15:20:19 -07:00
Jaikumar Ganesh
cedd460820
Merge "Make Bluetooth Health APIs public."
2011-09-08 15:19:37 -07:00
Jaikumar Ganesh
8ee53da561
Fix crash while connecting channel.
...
When an incoming connection comes and then we disconnect it,
and then launch the outgoing connection - we crash because
the channel path chan.mChannelPath is null.
Change-Id: I9115cc038f7ce85a193bf05d14b2b0a5e0579a69
2011-09-08 15:17:25 -07:00
Jaikumar Ganesh
eb9d34630f
Make Bluetooth Health APIs public.
...
Fix a few bugs:
a) Pass a integer token to identify the channel.
b) Close fds in case of errors.
Change-Id: I2046787be5008769435f2f72a5bd67c19b749da0
2011-09-08 15:17:17 -07:00
Romain Guy
8312b20d83
Merge "Save/restore display lists' canvas properly"
2011-09-08 15:06:05 -07:00
Romain Guy
e080af3754
Save/restore display lists' canvas properly
...
Change-Id: Ic016f0215f9fe5c67af98f059ecce4ed94994810
2011-09-08 15:05:26 -07:00
Chia-chi Yeh
6a2588d98d
am 81a5ec5b: Merge "RTP: support payloads with larger packetization interval."
...
* commit '81a5ec5b94d889656cc2f212102c441b91b2e3c0':
RTP: support payloads with larger packetization interval.
2011-09-08 14:08:08 -07:00
Chia-chi Yeh
81a5ec5b94
Merge "RTP: support payloads with larger packetization interval."
2011-09-08 14:07:00 -07:00
Tsu Chiang Chuang
99b3147571
am c9c541ad: Merge "idle test app for bandwidth usage."
...
* commit 'c9c541ad162d8b6dce9387251373de0a31092783':
idle test app for bandwidth usage.
2011-09-08 14:06:05 -07:00
Tsu Chiang Chuang
c9c541ad16
Merge "idle test app for bandwidth usage."
2011-09-08 14:04:52 -07:00
Adam Powell
e1e24f6e60
am dceee864: Merge "Fix bug 5249855 - put content descriptions for action bar tabs on images"
...
* commit 'dceee86438a7e950a63e80bf8f9347aeaa022a71':
Fix bug 5249855 - put content descriptions for action bar tabs on images
2011-09-08 14:02:52 -07:00
Dianne Hackborn
238fb93c19
am 3cb55598: Merge "Fix issue #5139085 : Some Recents items can\'t be killed"
...
* commit '3cb55598500be4cb3ae654cc2950a9338fb01a6a':
Fix issue #5139085 : Some Recents items can't be killed
2011-09-08 14:02:48 -07:00
Adam Powell
dceee86438
Merge "Fix bug 5249855 - put content descriptions for action bar tabs on images"
2011-09-08 14:01:03 -07:00
Dianne Hackborn
3cb5559850
Merge "Fix issue #5139085 : Some Recents items can't be killed"
2011-09-08 14:00:24 -07:00
Tsu Chiang Chuang
3ae29d4558
idle test app for bandwidth usage.
...
Change-Id: Ib35b27617369b360972e653db70bf5cf9303ddf1
2011-09-08 13:50:41 -07:00
Dave Santoro
dd15cbfd60
am 9fefa3c7: Merge "Add raw entities URI for profiles."
...
* commit '9fefa3c716e9c8d7dfb6c851c91e37e37732a955':
Add raw entities URI for profiles.
2011-09-08 13:39:46 -07:00
Dave Santoro
21f0de55c5
am a8f09b09: Merge "Add data_set for Settings table as well."
...
* commit 'a8f09b0946db9327f1d453cac92987f5e26e5102':
Add data_set for Settings table as well.
2011-09-08 13:39:41 -07:00
Dave Santoro
9fefa3c716
Merge "Add raw entities URI for profiles."
2011-09-08 13:38:00 -07:00
Dave Santoro
a8f09b0946
Merge "Add data_set for Settings table as well."
2011-09-08 13:37:43 -07:00
Dianne Hackborn
eeb1dca393
Fix issue #5139085 : Some Recents items can't be killed
...
Change-Id: Ib4fa413266c4aa2223576ce0299be743358fdc26
2011-09-08 13:30:11 -07:00
Subir Jhanb
b7fc29c78d
am 3adb1809: Merge "Changing the timeout for detecting syncs that are taking too long to bind BUG: 5222661"
...
* commit '3adb1809098998851b2486e5abad1ec612f9f85e':
Changing the timeout for detecting syncs that are taking too long to bind BUG: 5222661
2011-09-08 13:26:52 -07:00
Subir Jhanb
3adb180909
Merge "Changing the timeout for detecting syncs that are taking too long to bind BUG: 5222661"
2011-09-08 13:24:45 -07:00
Subir Jhanb
795b6490fe
Changing the timeout for detecting syncs that are taking too long to bind
...
BUG: 5222661
Change-Id: I9406980e26a4ee30ac6d5470bc97928e3dc74d24
2011-09-08 13:12:21 -07:00
Isaac Katzenelson
03410afb86
am 5e875259: Merge "Fix snippetizing cursor"
...
* commit '5e8752595f7a3d3dd1e0d469ac275295e38bcfe1':
Fix snippetizing cursor
2011-09-08 12:50:40 -07:00
Isaac Katzenelson
5e8752595f
Merge "Fix snippetizing cursor"
2011-09-08 12:49:13 -07:00
Adam Powell
65d5704476
Fix bug 5249855 - put content descriptions for action bar tabs on images
...
Change-Id: Iddf13e310237cffe517697b3c3ca429a1555dcbc
2011-09-08 12:30:43 -07:00
Andreas Huber
17f16d8f08
am 13561602: Merge "Audio player must not be used as a timesource before it\'s started."
...
* commit '135616025f06dfdfff3d6bed51885ef8de5f49b5':
Audio player must not be used as a timesource before it's started.
2011-09-08 11:41:05 -07:00
Andreas Huber
135616025f
Merge "Audio player must not be used as a timesource before it's started."
2011-09-08 11:39:17 -07:00
Andreas Huber
8458447162
Audio player must not be used as a timesource before it's started.
...
Otherwise it'll trigger a division-by-zero exception since the audio sample rate
is as yet unknown.
Change-Id: I0793aa7c1c348ffa2611272bb646eff6ecf6ff53
related-to-bug: 5242451
2011-09-08 11:33:47 -07:00
Xia Wang
28230570e6
am ab908992: Merge "Integrate ImageProcessing test into test framework http://b/issue?id=5274365 Change-Id: I7949b4114dcab17d895d04755df5df2bd5a576a3"
...
* commit 'ab90899264407669725a24eb941de9278e82c70f':
Integrate ImageProcessing test into test framework http://b/issue?id=5274365 Change-Id: I7949b4114dcab17d895d04755df5df2bd5a576a3
2011-09-08 11:22:29 -07:00
Xia Wang
ab90899264
Merge "Integrate ImageProcessing test into test framework http://b/issue?id=5274365 Change-Id: I7949b4114dcab17d895d04755df5df2bd5a576a3"
2011-09-08 11:20:32 -07:00
Gilles Debunne
da93a46371
am 15208ac5: Merge "No vibration when long pressing in the empty part of an EditText"
...
* commit '15208ac5003de16e8e3d9ec26c3ef05347da7731':
No vibration when long pressing in the empty part of an EditText
2011-09-08 11:20:04 -07:00
Gilles Debunne
dbac653e64
am df1324c3: Merge "Longpressing in landscape correctly starts selection mode."
...
* commit 'df1324c3cfcd94c1a634fd7f1ef97f15e0d727dc':
Longpressing in landscape correctly starts selection mode.
2011-09-08 11:20:01 -07:00
Gilles Debunne
15fd3514fa
am 0c4f8ec6: Merge "Updated text selection color. As in 133272"
...
* commit '0c4f8ec6d33f113e8173efa86901593cd8b84cdf':
Updated text selection color. As in 133272
2011-09-08 11:19:58 -07:00
Gilles Debunne
15208ac500
Merge "No vibration when long pressing in the empty part of an EditText"
2011-09-08 11:18:53 -07:00
Gilles Debunne
df1324c3cf
Merge "Longpressing in landscape correctly starts selection mode."
2011-09-08 11:18:36 -07:00
Gilles Debunne
0c4f8ec6d3
Merge "Updated text selection color. As in 133272"
2011-09-08 11:18:23 -07:00
Adam Powell
2174606ac5
am cad99824: Merge "Fix bug 5091269 - Set textColorLink to holo_blue_light for Holo themes"
...
* commit 'cad99824680b3c37138b901e26eeb3e287891f22':
Fix bug 5091269 - Set textColorLink to holo_blue_light for Holo themes
2011-09-08 11:05:32 -07:00
Adam Powell
334bf70172
am 156900c4: Merge "Fix bug 5174277 - Trouble with Menus"
...
* commit '156900c48b7758e57c995eaaea1479c10756ce38':
Fix bug 5174277 - Trouble with Menus
2011-09-08 11:03:26 -07:00
Adam Powell
cad9982468
Merge "Fix bug 5091269 - Set textColorLink to holo_blue_light for Holo themes"
2011-09-08 11:03:21 -07:00
Adam Powell
156900c48b
Merge "Fix bug 5174277 - Trouble with Menus"
2011-09-08 11:02:20 -07:00
Dianne Hackborn
569857cd44
am 4ee36669: Merge "Fix issue #5263361 : Browser instance not created in application picker"
...
* commit '4ee366690111e5f71a248a2af10301db425162d5':
Fix issue #5263361 : Browser instance not created in application picker
2011-09-08 10:41:59 -07:00
Steve Block
0596c46b25
am 703bde8c: Merge "Add FrameLayout.getMeasureAllChildren()"
...
* commit '703bde8ca5b2b5b7bc4460eacd48194278c45ae3':
Add FrameLayout.getMeasureAllChildren()
2011-09-08 10:39:48 -07:00
Dianne Hackborn
4ee3666901
Merge "Fix issue #5263361 : Browser instance not created in application picker"
2011-09-08 10:38:42 -07:00
Steve Block
703bde8ca5
Merge "Add FrameLayout.getMeasureAllChildren()"
2011-09-08 10:38:15 -07:00
Dianne Hackborn
905577f634
Fix issue #5263361 : Browser instance not created in application picker
...
The resolver activity was hiding the following activity from recents.
Also some other fixes: a little better memory use debugging, removed
some unneeded code from window manager, moved some system activities
into their own process, added some more running process information for
manage apps.
Change-Id: I66687d16989ff965d524b92dc360f37c19199717
2011-09-08 10:35:11 -07:00
Andy McFadden
7b0ce9644f
am 2d719afe: Merge "Resurrect verbose binder logging"
...
* commit '2d719afe813a0568aa12a34041686f86411e465c':
Resurrect verbose binder logging
2011-09-08 09:58:51 -07:00