Commit Graph

41076 Commits

Author SHA1 Message Date
Christopher Tate
87ecdfe640 am c51bb4d3: Merge "XML parsing optimizations" into ics-mr1
* commit 'c51bb4d394dd47e48abc8a6d9cbc740f821546ff':
  XML parsing optimizations
2011-11-11 16:21:28 -08:00
Christopher Tate
e61bd662d9 Merge "XML parsing optimizations" into ics-mr1 2011-11-11 16:19:29 -08:00
Dianne Hackborn
38524104d6 am 7ddf38a5: am be70785f: Make activity manager more robust in the face of app activity leaks.
* commit '7ddf38a5bf833f90057b0795dd9af6c61d3cf2d5':
  Make activity manager more robust in the face of app activity leaks.
2011-11-11 16:16:31 -08:00
Dianne Hackborn
0ac3e01aaf am be70785f: Make activity manager more robust in the face of app activity leaks.
* commit 'be70785f9b2dbd2c52fd8676d99bc64b22784201':
  Make activity manager more robust in the face of app activity leaks.
2011-11-11 16:13:46 -08:00
Jeff Brown
8a73d6d9cd Merge "Include the build fingerprint in bug reports." 2011-11-11 15:41:05 -08:00
Jeff Brown
9faa768a8b Merge "Seems to break text views all over. Particularly noticeable is that the labels in launcher icons appear left-justified. Multi-line text fields also wrap after every character." 2011-11-11 15:30:45 -08:00
Adam Powell
eade6e88c7 Merge "DO NOT MERGE Cherry pick from ics-mr1 - Bug 5275928 - Don't try to open an overflow menu under invalid circumstances." into ics-mr0 2011-11-11 14:54:02 -08:00
Robert Greenwalt
6f9202302c am 3100e2b0: am 24597eb7: Merge "Tone down Tethering logs." into ics-mr1
* commit '3100e2b01792e6868698e06ecf275f47f187d537':
  Tone down Tethering logs.
2011-11-11 14:41:18 -08:00
Robert Greenwalt
6cfc95481e am 24597eb7: Merge "Tone down Tethering logs." into ics-mr1
* commit '24597eb77e1a88994b83c5b1f45d5b72383943b8':
  Tone down Tethering logs.
2011-11-11 14:38:34 -08:00
Robert Greenwalt
8e86aeceb3 Merge "Tone down Tethering logs." into ics-mr1 2011-11-11 14:37:18 -08:00
Dianne Hackborn
ea2c9c854c am 0b554bab: am d400d03f: Merge "Fix issue #5595933: GREF leak due to race condition in..." into ics-mr1
* commit '0b554bab585fe2d7eaaca8692106e0cbbc3aabe4':
  Fix issue #5595933: GREF leak due to race condition in...
2011-11-11 14:28:57 -08:00
Christopher Tate
f8add975b5 am 9acae658: am 847fbbea: Merge "Localized optimizations in views and bitmaps" into ics-mr1
* commit '9acae658e179796beee91d673f9f70af49ae3c9b':
  Localized optimizations in views and bitmaps
2011-11-11 14:28:55 -08:00
Dianne Hackborn
ac284f3ef4 am d400d03f: Merge "Fix issue #5595933: GREF leak due to race condition in..." into ics-mr1
* commit 'd400d03f4a6384449f8b0d3c8a9aa7e1e8aa5a16':
  Fix issue #5595933: GREF leak due to race condition in...
2011-11-11 14:26:30 -08:00
Christopher Tate
fbefa6643a am 847fbbea: Merge "Localized optimizations in views and bitmaps" into ics-mr1
* commit '847fbbeaf9e3ba187a45d0a631f0c087ce25b7f6':
  Localized optimizations in views and bitmaps
2011-11-11 14:26:28 -08:00
Dianne Hackborn
b68fde0806 Merge "Fix issue #5595933: GREF leak due to race condition in..." into ics-mr1 2011-11-11 14:24:58 -08:00
Christopher Tate
f01724f46a Merge "Localized optimizations in views and bitmaps" into ics-mr1 2011-11-11 14:24:53 -08:00
Nick Pelly
39d8355053 am 4780228f: am 48b651cb: Merge "Changes for access control." into ics-mr1
* commit '4780228fb2476304e29ddf9a118c460ac4eb96ee':
  Changes for access control.
2011-11-11 13:59:09 -08:00
Matthew Xie
e82d70dbfe am 5a8ad071: am a303f0ec: Merge "Send CONNECT_OTHER_PROFILE to Device profile for hfp and a2dp incoming connect" into ics-mr1
* commit '5a8ad0717dad332cab4b2d9f7a6030b76cb8d6bb':
  Send CONNECT_OTHER_PROFILE to Device profile for hfp and a2dp incoming connect
2011-11-11 13:42:42 -08:00
Peter Ng
000e138d97 am b88cd4be: am 20d8c5ed: Merge "Making the quicksettings notifications icon the right opacity" into ics-mr1
* commit 'b88cd4bea3bd1dc3497b79e6da187ae0f858f266':
  Making the quicksettings notifications icon the right opacity
2011-11-11 13:42:36 -08:00
Nick Pelly
53bdc55273 am 48b651cb: Merge "Changes for access control." into ics-mr1
* commit '48b651cb2a3afab979c2a46185fd7edfa5424387':
  Changes for access control.
2011-11-11 13:08:37 -08:00
Nick Pelly
cce3281f62 Merge "Changes for access control." into ics-mr1 2011-11-11 13:06:44 -08:00
Matthew Xie
e4338c8ad2 am a303f0ec: Merge "Send CONNECT_OTHER_PROFILE to Device profile for hfp and a2dp incoming connect" into ics-mr1
* commit 'a303f0ecfc5472d3b2e65cb7de9f7413a9a83d9a':
  Send CONNECT_OTHER_PROFILE to Device profile for hfp and a2dp incoming connect
2011-11-11 12:18:22 -08:00
Matthew Xie
aa3a932ce8 Merge "Send CONNECT_OTHER_PROFILE to Device profile for hfp and a2dp incoming connect" into ics-mr1 2011-11-11 12:16:41 -08:00
Robert Ly
dba3ec9351 Merge "docs: ndk r7 rel notes" into ics-mr0 2011-11-11 12:06:39 -08:00
Peter Ng
a193902173 am 20d8c5ed: Merge "Making the quicksettings notifications icon the right opacity" into ics-mr1
* commit '20d8c5ed96d6fb81d14cbce5221025ed6c954d6e':
  Making the quicksettings notifications icon the right opacity
2011-11-11 11:59:40 -08:00
Peter Ng
aabb10eb68 Merge "Making the quicksettings notifications icon the right opacity" into ics-mr1 2011-11-11 11:57:41 -08:00
Dianne Hackborn
6708dd15fb am 8f45e3e2: am be425cce: Merge "Fix issue #5522658: Menu button shown on lock screen if app underneath requests it" into ics-mr1
* commit '8f45e3e280fa84494d5d45c73697645d20dea101':
  Fix issue #5522658: Menu button shown on lock screen if app underneath requests it
2011-11-11 11:51:21 -08:00
James Dong
89c06fce6f am 9a176507: am b7a000a6: Merge "Unhide the key to retriever location information in 3gp/mp4 files" into ics-mr1
* commit '9a176507a96ceb3640a56a5449e96fc3e406a765':
  Unhide the key to retriever location information in 3gp/mp4 files
2011-11-11 11:51:19 -08:00
Andreas Huber
1b63f90617 am 8a065423: am 23217182: Merge "Didn\'t mean to check this in..." into ics-mr1
* commit '8a0654231ff36d938bc3451190cf67231195f1d0':
  Didn't mean to check this in...
2011-11-11 11:51:17 -08:00
Robert Greenwalt
61a0c393aa am 2c41bce3: am 424781e2: Fix NPE in ConnectivityService.
* commit '2c41bce3f2134159ce64d589ff1bb298b9939178':
  Fix NPE in ConnectivityService.
2011-11-11 11:51:16 -08:00
Eric Laurent
9fe7088b82 am 2c29a5cf: am 1f8c6212: Merge "visualizer: reset buffer if playback is idle" into ics-mr1
* commit '2c29a5cf1658532bca4e34f816fa30312241a336':
  visualizer: reset buffer if playback is idle
2011-11-11 11:51:14 -08:00
Andreas Huber
78ed664799 am 40461ee7: am cd556b82: Merge "Instead of asserting, signal a runtime error if the session doesn\'t contain" into ics-mr1
* commit '40461ee70161d8568663332f72be2353b04c34e7':
  Instead of asserting, signal a runtime error if the session doesn't contain
2011-11-11 11:51:12 -08:00
Andreas Huber
2a484e15af am 9a87a838: (-s ours) am 5d42075e: Merge "DO NOT MERGE: Instead of asserting, remove active streams if their sockets" into ics-mr1
* commit '9a87a838028f3911a066a729cdb5ec688903a5ae':
  DO NOT MERGE: Instead of asserting, remove active streams if their sockets
2011-11-11 11:51:11 -08:00
Andreas Huber
21b916fae7 am 9c981cd3: am d9f25bc9: Merge "Disconnect on socket error on the RTSP control connection." into ics-mr1
* commit '9c981cd3d53238f10842368c1cd82d625b701a47':
  Disconnect on socket error on the RTSP control connection.
2011-11-11 11:51:09 -08:00
Narayan Kamath
a3ade07889 am 405fcc87: am 754c72ed: Notifiy callers when a speech synthesis error occurs.
* commit '405fcc87b247d91ce2b54623f351e91b740813c0':
  Notifiy callers when a speech synthesis error occurs.
2011-11-11 11:51:07 -08:00
Dianne Hackborn
dc0606b5d1 am be425cce: Merge "Fix issue #5522658: Menu button shown on lock screen if app underneath requests it" into ics-mr1
* commit 'be425ccea47c13d3f8f3d877fdbdcb3c074f7e8b':
  Fix issue #5522658: Menu button shown on lock screen if app underneath requests it
2011-11-11 11:48:33 -08:00
James Dong
32ec7224b0 am b7a000a6: Merge "Unhide the key to retriever location information in 3gp/mp4 files" into ics-mr1
* commit 'b7a000a6fb84ae75847e730332bae62ba1234999':
  Unhide the key to retriever location information in 3gp/mp4 files
2011-11-11 11:48:27 -08:00
Andreas Huber
86a7311ab6 am 23217182: Merge "Didn\'t mean to check this in..." into ics-mr1
* commit '23217182743521063655c6fb1b1580d3558cfbe7':
  Didn't mean to check this in...
2011-11-11 11:48:16 -08:00
Robert Greenwalt
4eb211e21b am 424781e2: Fix NPE in ConnectivityService.
* commit '424781e2e1a1f1447eea733ffd1dc0f8006b628e':
  Fix NPE in ConnectivityService.
2011-11-11 11:48:11 -08:00
Eric Laurent
86167c8032 am 1f8c6212: Merge "visualizer: reset buffer if playback is idle" into ics-mr1
* commit '1f8c621279ddb163ee3d63bf32d79955679db0c5':
  visualizer: reset buffer if playback is idle
2011-11-11 11:48:05 -08:00
Andreas Huber
a3d4049fcb am cd556b82: Merge "Instead of asserting, signal a runtime error if the session doesn\'t contain" into ics-mr1
* commit 'cd556b82fd12dceb49e9d6543f80212721b220ec':
  Instead of asserting, signal a runtime error if the session doesn't contain
2011-11-11 11:48:00 -08:00
Andreas Huber
2d4a178249 am 5d42075e: Merge "DO NOT MERGE: Instead of asserting, remove active streams if their sockets" into ics-mr1
* commit '5d42075e450a49af2bb37ca3a9610921df7607f2':
  DO NOT MERGE: Instead of asserting, remove active streams if their sockets
2011-11-11 11:47:58 -08:00
Andreas Huber
9ba00d8284 am d9f25bc9: Merge "Disconnect on socket error on the RTSP control connection." into ics-mr1
* commit 'd9f25bc941746f268ab978e6b2af7b7c4ec2ea89':
  Disconnect on socket error on the RTSP control connection.
2011-11-11 11:47:57 -08:00
Narayan Kamath
8063f8b346 am 754c72ed: Notifiy callers when a speech synthesis error occurs.
* commit '754c72ed9e8e83e5a913aa7552fc2e1b1b5277e0':
  Notifiy callers when a speech synthesis error occurs.
2011-11-11 11:47:54 -08:00
Dianne Hackborn
b7afe325b4 Merge "Fix issue #5522658: Menu button shown on lock screen if app underneath requests it" into ics-mr1 2011-11-11 11:36:14 -08:00
Matthew Xie
92d4cfe4a0 Merge "Add more comments to the file header to explain the state diagram" 2011-11-11 11:20:43 -08:00
James Dong
f6de140cb9 Merge "Unhide the key to retriever location information in 3gp/mp4 files" into ics-mr1 2011-11-11 10:49:24 -08:00
Andreas Huber
bd667dd719 Merge "Didn't mean to check this in..." into ics-mr1 2011-11-11 10:46:02 -08:00
Scott Main
9915dcceef Merge "docs: some helpful javadocs for network info" 2011-11-11 09:49:23 -08:00
Jesse Wilson
59fa20937c Merge "Document our potentially suprising behavior on date ranges ending at midnight." 2011-11-11 09:38:46 -08:00