22651 Commits

Author SHA1 Message Date
Daisuke Miyakawa
1c0e873916 Merge "Refactor vCard: move utilities for unit tests to test_utils directory." 2010-04-19 21:08:54 -07:00
Daisuke Miyakawa
8e798cf71e Refactor vCard: move utilities for unit tests to test_utils directory.
Change-Id: I4ef92633fb5eedc05f13ba53ca4ebc7e3e7ef8ce
2010-04-20 13:08:23 +09:00
Mathias Agopian
20f5a2fa88 am 732c73e1: am 26f61635: am 0a4ab1b9: Merge "fix [2599939] "cannot play video" after open/close a video player a dozen of times" into froyo 2010-04-19 19:39:04 -07:00
Mathias Agopian
732c73e1e7 am 26f61635: am 0a4ab1b9: Merge "fix [2599939] "cannot play video" after open/close a video player a dozen of times" into froyo
Merge commit '26f6163557980062dbb203388b3d0794ee0d06f7' into kraken

* commit '26f6163557980062dbb203388b3d0794ee0d06f7':
  fix [2599939] "cannot play video" after open/close a video player a dozen of times
2010-04-19 19:29:22 -07:00
Mathias Agopian
26f6163557 am 0a4ab1b9: Merge "fix [2599939] "cannot play video" after open/close a video player a dozen of times" into froyo
Merge commit '0a4ab1b9b4c7b891c1ecb67eed99e9c9b30c93aa' into froyo-plus-aosp

* commit '0a4ab1b9b4c7b891c1ecb67eed99e9c9b30c93aa':
  fix [2599939] "cannot play video" after open/close a video player a dozen of times
2010-04-19 19:26:31 -07:00
Jack Palevich
8ca856c445 am 15d484a7: am 06798769: am 7305f416: Merge "Quietly handle EGL_BAD_NATIVE_WINDOW errors" into froyo 2010-04-19 19:24:19 -07:00
Mathias Agopian
0a4ab1b9b4 Merge "fix [2599939] "cannot play video" after open/close a video player a dozen of times" into froyo 2010-04-19 19:23:45 -07:00
Jack Palevich
15d484a7ef am 06798769: am 7305f416: Merge "Quietly handle EGL_BAD_NATIVE_WINDOW errors" into froyo
Merge commit '0679876997a5523a7539b8fe2c74a39434b17820' into kraken

* commit '0679876997a5523a7539b8fe2c74a39434b17820':
  Quietly handle EGL_BAD_NATIVE_WINDOW errors
2010-04-19 19:15:12 -07:00
Daisuke Miyakawa
236c35b2ba am 72c0a3cf: (-s ours) am e3172405: am c86f0779: Make vCard allow users to refrain image export. Useful when receivers cannot accept image data. 2010-04-19 19:13:12 -07:00
Jack Palevich
0679876997 am 7305f416: Merge "Quietly handle EGL_BAD_NATIVE_WINDOW errors" into froyo
Merge commit '7305f4166306dac08fc63056f2c85e91015df879' into froyo-plus-aosp

* commit '7305f4166306dac08fc63056f2c85e91015df879':
  Quietly handle EGL_BAD_NATIVE_WINDOW errors
2010-04-19 19:10:13 -07:00
Mathias Agopian
92c3b39327 fix [2599939] "cannot play video" after open/close a video player a dozen of times
get rid off the MAP_ONCE flag is MemoryHeapBase (as well as it's functionality),
this feature should not be used anymore.

the software renderer was incorrectly using the default ctor which set MAP_ONCE,
causing the leak. the software renderer itself is incorrectly used while coming
back from sleep.

Change-Id: I123621f8d140550b864f352bbcd8a5729db12b57
2010-04-19 19:09:03 -07:00
Jack Palevich
7305f41663 Merge "Quietly handle EGL_BAD_NATIVE_WINDOW errors" into froyo 2010-04-19 19:06:35 -07:00
Daisuke Miyakawa
72c0a3cf28 am e3172405: am c86f0779: Make vCard allow users to refrain image export. Useful when receivers cannot accept image data.
Merge commit 'e31724050041b4be41b7c868d531a6c00fd94587' into kraken

* commit 'e31724050041b4be41b7c868d531a6c00fd94587':
  Make vCard allow users to refrain image export. Useful when
2010-04-19 18:59:20 -07:00
Jaikumar Ganesh
84b2e62db3 Fix runtime reboot when connecting to a A2DP headset and
user toggles BT state.

Bug:2607218

This happens when Bluetooth is turned off, and when the headset is
still trying to connect. We get the connection result of
attempt before Bluetooth was toggled. We need to ignore this result.

Change-Id: I611232631b7f67f4a1ea803de0dcf4b749c1d8d5
2010-04-19 18:55:16 -07:00
Daisuke Miyakawa
e317240500 am c86f0779: Make vCard allow users to refrain image export. Useful when receivers cannot accept image data.
Merge commit 'c86f0779d6aa60d7eb446fb33742dac6bfc3b6b8' into froyo-plus-aosp

* commit 'c86f0779d6aa60d7eb446fb33742dac6bfc3b6b8':
  Make vCard allow users to refrain image export. Useful when
2010-04-19 18:52:07 -07:00
Daisuke Miyakawa
c86f0779d6 Make vCard allow users to refrain image export. Useful when
receivers cannot accept image data.

Bug: 2603200
Change-Id: I3c490b2de37ebb2780df4a27a440df3b0afacb3a
2010-04-20 09:53:30 +09:00
Grace Kloba
9a6c37a522 am fcc08fb8: am 8831d4dc: am 8f655cb6: Merge "Update the comment which supposed to be checked in in the last CL." into froyo 2010-04-19 16:26:50 -07:00
Grace Kloba
fcc08fb8ed am 8831d4dc: am 8f655cb6: Merge "Update the comment which supposed to be checked in in the last CL." into froyo
Merge commit '8831d4dc5545cde841a0ef318b0ec870acfa0e45' into kraken

* commit '8831d4dc5545cde841a0ef318b0ec870acfa0e45':
  Update the comment which supposed to be checked in
2010-04-19 16:19:30 -07:00
Grace Kloba
8831d4dc55 am 8f655cb6: Merge "Update the comment which supposed to be checked in in the last CL." into froyo
Merge commit '8f655cb6c836380778545fb13044d97ef57139d6' into froyo-plus-aosp

* commit '8f655cb6c836380778545fb13044d97ef57139d6':
  Update the comment which supposed to be checked in
2010-04-19 16:15:41 -07:00
Grace Kloba
8f655cb6c8 Merge "Update the comment which supposed to be checked in in the last CL." into froyo 2010-04-19 16:11:21 -07:00
Grace Kloba
f706ef857b Update the comment which supposed to be checked in
in the last CL.

Fix http://b/issue?id=2607352
2010-04-19 16:05:19 -07:00
Adam Powell
b19b17ed39 am 8dc38941: am 7f30f8ab: am 93d35f77: Merge "Fix bug 2587373 - awaken scrollbars when a scrolling view becomes visible." into froyo 2010-04-19 15:49:44 -07:00
Adam Powell
8dc38941b4 am 7f30f8ab: am 93d35f77: Merge "Fix bug 2587373 - awaken scrollbars when a scrolling view becomes visible." into froyo
Merge commit '7f30f8abe3161ae912c3475aa89ad14388f576d7' into kraken

* commit '7f30f8abe3161ae912c3475aa89ad14388f576d7':
  Fix bug 2587373 - awaken scrollbars when a scrolling view becomes visible.
2010-04-19 15:41:05 -07:00
Adam Powell
7f30f8abe3 am 93d35f77: Merge "Fix bug 2587373 - awaken scrollbars when a scrolling view becomes visible." into froyo
Merge commit '93d35f77439f54cc55ff63b6e274dec0ac6c3c47' into froyo-plus-aosp

* commit '93d35f77439f54cc55ff63b6e274dec0ac6c3c47':
  Fix bug 2587373 - awaken scrollbars when a scrolling view becomes visible.
2010-04-19 15:38:11 -07:00
Adam Powell
93d35f7743 Merge "Fix bug 2587373 - awaken scrollbars when a scrolling view becomes visible." into froyo 2010-04-19 15:33:08 -07:00
Adam Powell
8568c3a09b Fix bug 2587373 - awaken scrollbars when a scrolling view becomes visible.
Change-Id: I7eb38c53c3a03b23786b8b0c2d16139acd0eb38e
2010-04-19 15:26:15 -07:00
Dianne Hackborn
2dedce6e84 Introducing Fragment.
Basic implementation of an API for organizing a single activity into separate,
discrete pieces.  Currently supports adding and removing fragments, and
performing basic lifecycle callbacks on them.

Change-Id: I6ea8e6bdb04d93f8105c2e983fe9b6532422de34
2010-04-19 15:09:31 -07:00
Raphael
2df4c76b96 Merge "Fix aapt to build in Windows SDK under Linux" 2010-04-19 14:53:36 -07:00
Daniel Lehmann
e6786376b3 Merge "Ensure public methods exist to update the state of the UI, so that it can be set from outside" 2010-04-19 13:42:54 -07:00
Daniel Lehmann
4fcc5b1f93 Ensure public methods exist to update the state of the UI, so that it can be set from outside
Change-Id: Ib1d7b0b36b6cdcbf1256647da76130927a29ec6d
2010-04-19 13:41:07 -07:00
Robert Greenwalt
3fce2ef599 am 3d27a2e6: am 2f8c9e68: am f06f2eb2: Merge "Misc fixes for throttling." into froyo 2010-04-19 13:39:01 -07:00
Robert Greenwalt
3d27a2e6a1 am 2f8c9e68: am f06f2eb2: Merge "Misc fixes for throttling." into froyo
Merge commit '2f8c9e6825e31614f26f8d9f3c1de7be2f3e9f9e' into kraken

* commit '2f8c9e6825e31614f26f8d9f3c1de7be2f3e9f9e':
  Misc fixes for throttling.
2010-04-19 13:31:24 -07:00
Grace Kloba
53be241f73 am 4a77f9e9: am e3ce4c89: am 2dc78498: Merge "Remove fixed size restriction on the SurfaceView before setting it to the full screen content view." into froyo 2010-04-19 13:27:44 -07:00
Robert Greenwalt
2f8c9e6825 am f06f2eb2: Merge "Misc fixes for throttling." into froyo
Merge commit 'f06f2eb2d646789d723d4a08d0681cae5b40b768' into froyo-plus-aosp

* commit 'f06f2eb2d646789d723d4a08d0681cae5b40b768':
  Misc fixes for throttling.
2010-04-19 13:25:46 -07:00
Grace Kloba
4a77f9e9a2 am e3ce4c89: am 2dc78498: Merge "Remove fixed size restriction on the SurfaceView before setting it to the full screen content view." into froyo
Merge commit 'e3ce4c89cc54770f01294adc3c3f052c062098c7' into kraken

* commit 'e3ce4c89cc54770f01294adc3c3f052c062098c7':
  Remove fixed size restriction on the SurfaceView
2010-04-19 13:21:58 -07:00
Robert Greenwalt
f06f2eb2d6 Merge "Misc fixes for throttling." into froyo 2010-04-19 13:21:01 -07:00
Grace Kloba
e3ce4c89cc am 2dc78498: Merge "Remove fixed size restriction on the SurfaceView before setting it to the full screen content view." into froyo
Merge commit '2dc784988aa1660d02b50ed4e7d7679ba14b25b4' into froyo-plus-aosp

* commit '2dc784988aa1660d02b50ed4e7d7679ba14b25b4':
  Remove fixed size restriction on the SurfaceView
2010-04-19 13:17:53 -07:00
Grace Kloba
2dc784988a Merge "Remove fixed size restriction on the SurfaceView before setting it to the full screen content view." into froyo 2010-04-19 13:14:21 -07:00
Scott Main
bb7ecba563 am 08e15982: am f57f147b: am 5ce309d3: Merge "add droiddoc flag to include since-tags for api level 8" into froyo 2010-04-19 12:44:31 -07:00
Scott Main
08e1598243 am f57f147b: am 5ce309d3: Merge "add droiddoc flag to include since-tags for api level 8" into froyo
Merge commit 'f57f147bfd5d6f7530a938d2e05fc7d68f7343c3' into kraken

* commit 'f57f147bfd5d6f7530a938d2e05fc7d68f7343c3':
  add droiddoc flag to include since-tags for api level 8
2010-04-19 12:36:17 -07:00
Brad Fitzpatrick
c322f51f8c am eb828459: am bb9739c5: am 11bea2e2: Merge "Reduce lock contention, removing unnecessary synchronization." into froyo 2010-04-19 12:36:01 -07:00
Grace Kloba
4ead13caa3 am e5afb10c: am 66fa5cc7: am 99c5179f: Merge "Force redraw in touch_up if there is a move." into froyo 2010-04-19 12:35:57 -07:00
Scott Main
f57f147bfd am 5ce309d3: Merge "add droiddoc flag to include since-tags for api level 8" into froyo
Merge commit '5ce309d32e9aa28af4d2a6523ba2a4bc8e6d2f53' into froyo-plus-aosp

* commit '5ce309d32e9aa28af4d2a6523ba2a4bc8e6d2f53':
  add droiddoc flag to include since-tags for api level 8
2010-04-19 12:33:18 -07:00
Robert Greenwalt
05d0673bfc Misc fixes for throttling.
Cleanup of duplicate code
Caching Ntp data so we don't hit the network as often
Clearing out of MRU data when we switch to a new sim
Sending notification after we reset byte counts

bug:2605277
bug:2605272
bug:2597530
bug:2576057
Change-Id: I3df526bae6374f6ae56fed67b0defad2b4fabefd
2010-04-19 12:29:29 -07:00
Scott Main
5ce309d32e Merge "add droiddoc flag to include since-tags for api level 8" into froyo 2010-04-19 12:28:15 -07:00
Brad Fitzpatrick
eb82845977 am bb9739c5: am 11bea2e2: Merge "Reduce lock contention, removing unnecessary synchronization." into froyo
Merge commit 'bb9739c5d74404b9155565f2a08509079b719a22' into kraken

* commit 'bb9739c5d74404b9155565f2a08509079b719a22':
  Reduce lock contention, removing unnecessary synchronization.
2010-04-19 12:23:58 -07:00
Grace Kloba
e5afb10cca am 66fa5cc7: am 99c5179f: Merge "Force redraw in touch_up if there is a move." into froyo
Merge commit '66fa5cc73dd20e8656c478e95f07798d8e20b44a' into kraken

* commit '66fa5cc73dd20e8656c478e95f07798d8e20b44a':
  Force redraw in touch_up if there is a move.
2010-04-19 12:23:54 -07:00
Brad Fitzpatrick
bb9739c5d7 am 11bea2e2: Merge "Reduce lock contention, removing unnecessary synchronization." into froyo
Merge commit '11bea2e216800c5612144f76d307da653d565be3' into froyo-plus-aosp

* commit '11bea2e216800c5612144f76d307da653d565be3':
  Reduce lock contention, removing unnecessary synchronization.
2010-04-19 12:22:07 -07:00
Grace Kloba
66fa5cc73d am 99c5179f: Merge "Force redraw in touch_up if there is a move." into froyo
Merge commit '99c5179fafcccff2bcc05b4c7fb04007bb438f67' into froyo-plus-aosp

* commit '99c5179fafcccff2bcc05b4c7fb04007bb438f67':
  Force redraw in touch_up if there is a move.
2010-04-19 12:18:22 -07:00
Brad Fitzpatrick
11bea2e216 Merge "Reduce lock contention, removing unnecessary synchronization." into froyo 2010-04-19 12:17:48 -07:00