Commit Graph

20294 Commits

Author SHA1 Message Date
Robert Greenwalt
b3e26eb241 am 4ef6d2ea: Merge "Pass roaming info to ConnectivityService."
* commit '4ef6d2ea215169c2c0cbab14228e5073e986392b':
  Pass roaming info to ConnectivityService.
2011-09-09 09:03:03 -07:00
Teng-Hui Zhu
2df91e228c am a4248f69: Merge "Don\'t sleep when inline video start"
* commit 'a4248f6932750ac8a472a02fb9d3927194ba59b6':
  Don't sleep when inline video start
2011-09-09 09:02:46 -07:00
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
Robert Greenwalt
4ef6d2ea21 Merge "Pass roaming info to ConnectivityService." 2011-09-08 16:03:45 -07:00
Teng-Hui Zhu
a4248f6932 Merge "Don't sleep when inline video start" 2011-09-08 15:41:54 -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
Teng-Hui Zhu
690ad54090 Don't sleep when inline video start
bug:4563692

Change-Id: I0174403e3f78b5a637500fbaaf7f9219efe0cbc8
2011-09-08 14:36:33 -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
Adam Powell
dceee86438 Merge "Fix bug 5249855 - put content descriptions for action bar tabs on images" 2011-09-08 14:01:03 -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
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
Robert Greenwalt
a6d4248e21 Pass roaming info to ConnectivityService.
bug:5215657
Change-Id: I77024141a7bbaa47eae021009e16b283699be53e
2011-09-08 12:01:59 -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
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
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
Joe Fernandez
188fef75a6 am e8baa979: Merge "docs: adding warning to managedQuery() JavaDoc about cursor.close()"
* commit 'e8baa9797b89145a2e15aaf2707d74e0da21e425':
  docs: adding warning to managedQuery() JavaDoc about cursor.close()
2011-09-08 09:44:37 -07:00
Joe Fernandez
e8baa9797b Merge "docs: adding warning to managedQuery() JavaDoc about cursor.close()" 2011-09-08 09:42:38 -07:00
Jeff Sharkey
b24eb7aa7a am 66b10a1c: Merge "Poll UID stats during iface changes, enforce idx."
* commit '66b10a1cf77e1dd767508930a950b1584143ee9b':
  Poll UID stats during iface changes, enforce idx.
2011-09-08 04:59:24 -07:00
Jeff Sharkey
66b10a1cf7 Merge "Poll UID stats during iface changes, enforce idx." 2011-09-07 21:41:05 -07:00
Adam Powell
1d07e16c9d Fix bug 5174277 - Trouble with Menus
Make sure that options menu panel presenters associated with a PhoneWindow
get re-wired properly when a new menu is generated.

Change-Id: Ic06130019aec8b8edc372054c348f147d164fc5f
2011-09-07 20:47:13 -07:00
satok
6795dae72c am 76866208: Merge "Send onViewClicked in the extract mode"
* commit '76866208f81988fa653568513112b152e156d806':
  Send onViewClicked in the extract mode
2011-09-07 19:53:23 -07:00
satok
76866208f8 Merge "Send onViewClicked in the extract mode" 2011-09-07 19:50:54 -07:00
satok
a67a3cfc7c Send onViewClicked in the extract mode
Bug: 5257838
Change-Id: I16547aab86812f2db45deb879ad887dc38968164
2011-09-08 11:46:35 +09:00
Svetoslav Ganov
5c0666d6a9 am aacbf911: Merge "Not visible view should not be announced or interacted with."
* commit 'aacbf9111b58f10f7474fbd3a8debb02713f8b18':
  Not visible view should not be announced or interacted with.
2011-09-07 18:27:09 -07:00
Svetoslav Ganov
aacbf9111b Merge "Not visible view should not be announced or interacted with." 2011-09-07 18:24:25 -07:00