15039 Commits

Author SHA1 Message Date
Oscar Montemayor
a8529f6867 Encrypted File Systems Project. Installer modifications.
Started to modify isntaller for data redirection to a secure location.
2009-11-24 11:44:19 -08:00
Jean-Baptiste Queru
579d418db0 resolved conflicts for merge of f5f38bec to master 2009-11-24 09:37:33 -08:00
Jean-Baptiste Queru
f5f38bec1a merge from open-source master 2009-11-24 09:22:50 -08:00
Leon Scroggins
5ec498b39c am 62776524: am ecfc0eba: Fix soft keyboard dismissing itself when zooming into a textfield in browser.
Merge commit '627765245bb89bc590a1cecaaf935414f076618b'

* commit '627765245bb89bc590a1cecaaf935414f076618b':
  Fix soft keyboard dismissing itself when zooming into a textfield in browser.
2009-11-24 06:34:56 -08:00
Leon Scroggins
627765245b am ecfc0eba: Fix soft keyboard dismissing itself when zooming into a textfield in browser.
Merge commit 'ecfc0eba609f88579ea5b70c57e6763ee3a28e5d' into eclair-mr2-plus-aosp

* commit 'ecfc0eba609f88579ea5b70c57e6763ee3a28e5d':
  Fix soft keyboard dismissing itself when zooming into a textfield in browser.
2009-11-24 06:29:17 -08:00
Leon Scroggins
ecfc0eba60 Fix soft keyboard dismissing itself when zooming into a textfield in browser.
We remove the WebTextView while zooming.  If the WebTextView ended up
offscreen, we remove it completely, thus hiding the IME.  In some cases,
however, the WebTextView is only offscreen because the IME overlapped it.
Check to see if the IME is showing, and if so, adjust the WebTextView and
let it get scrolled into view.

Also perform the removal/change in text size inside the method, so it
happens in both places.

Lastly, do not call didUpdateTextViewBounds if there is no WebTextView.

Fix for http://b/issue?id=2266066
2009-11-24 09:21:48 -05:00
Dave Sparks
9f14b6a521 am 3d14b1a1: am 1e914ac7: am 16cc72bd: Fix simulator build.
Merge commit '3d14b1a17066b57b579859c246da1397f4e0a123'

* commit '3d14b1a17066b57b579859c246da1397f4e0a123':
  Fix simulator build.
2009-11-23 20:08:12 -08:00
Dave Sparks
53fbe69a48 am 551e1a76: am ebcb7c31: am 8424ec32: Merge change I0f9a53d4 into eclair
Merge commit '551e1a7608887c5bb29b65f3b4aab058fdd06c80'

* commit '551e1a7608887c5bb29b65f3b4aab058fdd06c80':
  Set metadata retriever thread group to the caller's group.
2009-11-23 20:07:47 -08:00
Dave Sparks
3d14b1a170 am 1e914ac7: am 16cc72bd: Fix simulator build.
Merge commit '1e914ac7fce9523b5a932389798589eba91ca4dd' into eclair-mr2-plus-aosp

* commit '1e914ac7fce9523b5a932389798589eba91ca4dd':
  Fix simulator build.
2009-11-23 20:03:28 -08:00
Dave Sparks
551e1a7608 am ebcb7c31: am 8424ec32: Merge change I0f9a53d4 into eclair
Merge commit 'ebcb7c3167e76c19d4721dbc472772744918e868' into eclair-mr2-plus-aosp

* commit 'ebcb7c3167e76c19d4721dbc472772744918e868':
  Set metadata retriever thread group to the caller's group.
2009-11-23 20:03:03 -08:00
Dave Sparks
1e914ac7fc am 16cc72bd: Fix simulator build.
Merge commit '16cc72bdef471ffeee3f61eba8262783de248b04' into eclair-mr2

* commit '16cc72bdef471ffeee3f61eba8262783de248b04':
  Fix simulator build.
2009-11-23 19:58:33 -08:00
Dave Sparks
ebcb7c3167 am 8424ec32: Merge change I0f9a53d4 into eclair
Merge commit '8424ec323b2bc38887370c75e2c1fcd84bcdb013' into eclair-mr2

* commit '8424ec323b2bc38887370c75e2c1fcd84bcdb013':
  Set metadata retriever thread group to the caller's group.
2009-11-23 19:58:00 -08:00
Dave Sparks
16cc72bdef Fix simulator build. 2009-11-23 19:51:33 -08:00
Dan Egnor
0257fec32d am 82fa9c46: am b59573cf: Merge change I06fb08c4 into eclair-mr2
Merge commit '82fa9c46cfccfc0955aeb5b18ff56ebf0d7312a9'

* commit '82fa9c46cfccfc0955aeb5b18ff56ebf0d7312a9':
  Expand db_operation logging to prepare for widespread sample collection:
2009-11-23 19:20:15 -08:00
Dan Egnor
82fa9c46cf am b59573cf: Merge change I06fb08c4 into eclair-mr2
Merge commit 'b59573cf53c8f09ac25fe0bfaf1d7067604ee983' into eclair-mr2-plus-aosp

* commit 'b59573cf53c8f09ac25fe0bfaf1d7067604ee983':
  Expand db_operation logging to prepare for widespread sample collection:
2009-11-23 19:14:23 -08:00
Android (Google) Code Review
b59573cf53 Merge change I06fb08c4 into eclair-mr2
* changes:
  Expand db_operation logging to prepare for widespread sample collection: - always enable the log, but subsample for queries faster than 100ms - add information about whether it's blocking a main thread - log the entire sql (have not yet added quoted-string-stripping)
2009-11-23 19:10:17 -08:00
Dan Egnor
12311959c6 Expand db_operation logging to prepare for widespread sample collection:
- always enable the log, but subsample for queries faster than 100ms
- add information about whether it's blocking a main thread
- log the entire sql (have not yet added quoted-string-stripping)
2009-11-23 18:26:14 -08:00
Android (Google) Code Review
8424ec323b Merge change I0f9a53d4 into eclair
* changes:
  Set metadata retriever thread group to the caller's group.
2009-11-23 17:58:24 -08:00
Dave Sparks
719ab50b7b am 94481bd7: am f52ebbfc: am 9a219519: Merge change I2d32301b into eclair
Merge commit '94481bd75541b227eb4325a3db5ee871cdc2b2dc'

* commit '94481bd75541b227eb4325a3db5ee871cdc2b2dc':
  Add 4 new notification sounds.
2009-11-23 17:55:36 -08:00
Dave Sparks
94481bd755 am f52ebbfc: am 9a219519: Merge change I2d32301b into eclair
Merge commit 'f52ebbfc5d1d1abbf1ad39c1e8308fd4029491fb' into eclair-mr2-plus-aosp

* commit 'f52ebbfc5d1d1abbf1ad39c1e8308fd4029491fb':
  Add 4 new notification sounds.
2009-11-23 17:50:22 -08:00
Dave Sparks
f52ebbfc5d am 9a219519: Merge change I2d32301b into eclair
Merge commit '9a219519786ce6702c57ec1f1bffe2260fc663a9' into eclair-mr2

* commit '9a219519786ce6702c57ec1f1bffe2260fc663a9':
  Add 4 new notification sounds.
2009-11-23 17:45:57 -08:00
Android (Google) Code Review
9a21951978 Merge change I2d32301b into eclair
* changes:
  Add 4 new notification sounds.
2009-11-23 17:42:41 -08:00
Dave Sparks
2d32301be0 Add 4 new notification sounds. 2009-11-23 17:26:37 -08:00
Dave Sparks
0f9a53d499 Set metadata retriever thread group to the caller's group.
This patch modifies the native binder interface to the metadata
retriever to pass the caller's thread group across the binder
interface. On the server side, the thread scheduler group is
set to the caller's scheduler group temporarily and restored
after the request has completed. This patch also reverts a
previous patch where the priority of the thread was forced to
a low priority foreground thread.

This should give apps more control over the priority of their
metadata retrieval, particularly allow background process to
run without hogging the CPU.
2009-11-23 16:51:15 -08:00
Jason Sams
79e2646504 am 9f96a37a: am 6a2500a3: am 39dbb099: Merge change I36176536 into eclair
Merge commit '9f96a37aabbffffe719c1dfb73b5c437f190bcf0'

* commit '9f96a37aabbffffe719c1dfb73b5c437f190bcf0':
  Fix ref counting bug that could cause memory leak in allApps.
2009-11-23 16:29:46 -08:00
Dianne Hackborn
9e7cd27daf am 01d9fe1d: am cfe90ce4: am 05799981: Fix issue #2281046: Size and pressure don\'t change
Merge commit '01d9fe1d064af2394c82648c0ec7ffa721353889'

* commit '01d9fe1d064af2394c82648c0ec7ffa721353889':
  Fix issue #2281046: Size and pressure don't change
2009-11-23 16:29:11 -08:00
Jason Sams
9f96a37aab am 6a2500a3: am 39dbb099: Merge change I36176536 into eclair
Merge commit '6a2500a330ef41cbfca40827b60e9f5efdf72db7' into eclair-mr2-plus-aosp

* commit '6a2500a330ef41cbfca40827b60e9f5efdf72db7':
  Fix ref counting bug that could cause memory leak in allApps.
2009-11-23 16:24:17 -08:00
Jason Sams
6a2500a330 am 39dbb099: Merge change I36176536 into eclair
Merge commit '39dbb099974f2c8e1154f28123e53be14c47a76d' into eclair-mr2

* commit '39dbb099974f2c8e1154f28123e53be14c47a76d':
  Fix ref counting bug that could cause memory leak in allApps.
2009-11-23 16:19:37 -08:00
Android (Google) Code Review
39dbb09997 Merge change I36176536 into eclair
* changes:
  Fix ref counting bug that could cause memory leak in allApps.
2009-11-23 16:14:13 -08:00
Andreas Huber
f0de482c02 am 4bbdf934: am 44e15c44: Some playable/decodable streams have been found in the wild that violate this assertion, let\'s be lenient for now.
Merge commit '4bbdf934458253dbdb331d2b614a085256ba8d6c'

* commit '4bbdf934458253dbdb331d2b614a085256ba8d6c':
  Some playable/decodable streams have been found in the wild that violate this assertion, let's be lenient for now.
2009-11-23 16:07:26 -08:00
Andreas Huber
2fadaf5634 am 5884468b: am 1f522294: Merge change I24b0a95d into eclair-mr2
Merge commit '5884468b448a5e2810d2ae421b69cc9c18a1a2f5'

* commit '5884468b448a5e2810d2ae421b69cc9c18a1a2f5':
  The original delay after which we dropped a frame was too aggressive. 40ms lateness seems more appropriate (about 25fps).
2009-11-23 16:06:56 -08:00
Andreas Huber
19cbbb8b0f am d1f11997: am e71a6408: Merge change I1bceff91 into eclair-mr2
Merge commit 'd1f11997e5845938b50a58dd3aecbc966ee00373'

* commit 'd1f11997e5845938b50a58dd3aecbc966ee00373':
  Make sure the decoder's input buffers are large enough to hold the largest input data. Verify that the setting actually sticks.
2009-11-23 16:06:25 -08:00
Dirk Dougherty
5a25769584 am dd6a5895: am e0030418: am bca9f1bb: sdk doc change for esr: updates for android 1.6 r2, tools r4, api levels.
Merge commit 'dd6a5895f1fe18fafdd78d96002618f2419f7979'

* commit 'dd6a5895f1fe18fafdd78d96002618f2419f7979':
  sdk doc change for esr: updates for android 1.6 r2, tools r4, api levels.
2009-11-23 16:05:56 -08:00
Eric Olsen
111e602095 am f7a57218: am b2796da2: am 0d631b9b: Merge change Ie7096ebb into eclair
Merge commit 'f7a5721895ee95f4c7b58e8993fb03ec017dab85'

* commit 'f7a5721895ee95f4c7b58e8993fb03ec017dab85':
  Add logging of headset events to help debug issue.
2009-11-23 16:05:25 -08:00
Dianne Hackborn
01d9fe1d06 am cfe90ce4: am 05799981: Fix issue #2281046: Size and pressure don\'t change
Merge commit 'cfe90ce461eacf3ae6a8556594a0f682a31cfb84' into eclair-mr2-plus-aosp

* commit 'cfe90ce461eacf3ae6a8556594a0f682a31cfb84':
  Fix issue #2281046: Size and pressure don't change
2009-11-23 16:03:16 -08:00
Dianne Hackborn
cfe90ce461 am 05799981: Fix issue #2281046: Size and pressure don\'t change
Merge commit '05799981d8d930e0b929cdb99f9407e3ee18c142' into eclair-mr2

* commit '05799981d8d930e0b929cdb99f9407e3ee18c142':
  Fix issue #2281046: Size and pressure don't change
2009-11-23 15:58:18 -08:00
Dianne Hackborn
05799981d8 Fix issue #2281046: Size and pressure don't change
Change-Id: Iadc1d438a494bb1495ee6d93d0dd3b4a491a378f
2009-11-23 15:49:15 -08:00
Andreas Huber
4bbdf93445 am 44e15c44: Some playable/decodable streams have been found in the wild that violate this assertion, let\'s be lenient for now.
Merge commit '44e15c44ad10b36bd3649b21ea7432348e2f05f8' into eclair-mr2-plus-aosp

* commit '44e15c44ad10b36bd3649b21ea7432348e2f05f8':
  Some playable/decodable streams have been found in the wild that violate this assertion, let's be lenient for now.
2009-11-23 15:39:26 -08:00
Fred Quintana
be62ddd4ee resolved conflicts for merge of eb393ce8 to master 2009-11-23 15:36:25 -08:00
Jason Sams
361765361a Fix ref counting bug that could cause memory leak in allApps. 2009-11-23 15:28:55 -08:00
Andreas Huber
44e15c44ad Some playable/decodable streams have been found in the wild that violate this assertion, let's be lenient for now. 2009-11-23 15:14:44 -08:00
Andreas Huber
5884468b44 am 1f522294: Merge change I24b0a95d into eclair-mr2
Merge commit '1f52229453c3df8eaeda64133bd332b01589354f' into eclair-mr2-plus-aosp

* commit '1f52229453c3df8eaeda64133bd332b01589354f':
  The original delay after which we dropped a frame was too aggressive. 40ms lateness seems more appropriate (about 25fps).
2009-11-23 14:42:30 -08:00
Android (Google) Code Review
1f52229453 Merge change I24b0a95d into eclair-mr2
* changes:
  The original delay after which we dropped a frame was too aggressive. 40ms lateness seems more appropriate (about 25fps).
2009-11-23 14:39:03 -08:00
Andreas Huber
d1f11997e5 am e71a6408: Merge change I1bceff91 into eclair-mr2
Merge commit 'e71a6408867a80f847cd3f7671f6ef009f67a78e' into eclair-mr2-plus-aosp

* commit 'e71a6408867a80f847cd3f7671f6ef009f67a78e':
  Make sure the decoder's input buffers are large enough to hold the largest input data. Verify that the setting actually sticks.
2009-11-23 14:31:25 -08:00
Dirk Dougherty
dd6a5895f1 am e0030418: am bca9f1bb: sdk doc change for esr: updates for android 1.6 r2, tools r4, api levels.
Merge commit 'e0030418fd4b9a9a2d0422a5538a76ca6b40710c' into eclair-mr2-plus-aosp

* commit 'e0030418fd4b9a9a2d0422a5538a76ca6b40710c':
  sdk doc change for esr: updates for android 1.6 r2, tools r4, api levels.
2009-11-23 14:31:01 -08:00
Eric Olsen
f7a5721895 am b2796da2: am 0d631b9b: Merge change Ie7096ebb into eclair
Merge commit 'b2796da2ed4d0ef3bd94e187156c3d21e7e2a07f' into eclair-mr2-plus-aosp

* commit 'b2796da2ed4d0ef3bd94e187156c3d21e7e2a07f':
  Add logging of headset events to help debug issue.
2009-11-23 14:30:35 -08:00
Android (Google) Code Review
e71a640886 Merge change I1bceff91 into eclair-mr2
* changes:
  Make sure the decoder's input buffers are large enough to hold the largest input data. Verify that the setting actually sticks.
2009-11-23 14:26:46 -08:00
Andreas Huber
1bceff916a Make sure the decoder's input buffers are large enough to hold the largest input data. Verify that the setting actually sticks. 2009-11-23 14:06:42 -08:00
Andreas Huber
24b0a95de7 The original delay after which we dropped a frame was too aggressive. 40ms lateness seems more appropriate (about 25fps). 2009-11-23 14:04:48 -08:00
Dirk Dougherty
e0030418fd am bca9f1bb: sdk doc change for esr: updates for android 1.6 r2, tools r4, api levels.
Merge commit 'bca9f1bbb31cf05ba17af049a5ea37f57981f00e' into eclair-mr2

* commit 'bca9f1bbb31cf05ba17af049a5ea37f57981f00e':
  sdk doc change for esr: updates for android 1.6 r2, tools r4, api levels.
2009-11-23 13:55:50 -08:00