Commit Graph

5242 Commits

Author SHA1 Message Date
Patrick Scott
cab9cb1970 am 169ef4cc: Check for null before returing a chunk from the pool.
Merge commit '169ef4cca30c77a1a85c9684560c504a5ac230b5' into eclair-mr2-plus-aosp

* commit '169ef4cca30c77a1a85c9684560c504a5ac230b5':
  Check for null before returing a chunk from the pool.
2009-10-19 10:13:57 -07:00
Patrick Scott
169ef4cca3 Check for null before returing a chunk from the pool.
Since references can be queued in another thread, the first entry in the pool
could have been queued after processPoolLocked. Check for null and create a new
chunk if the check fails.
2009-10-19 13:04:08 -04:00
Ben Murdoch
c17a6895bf am 208360b2: Fix for b/2164520: Download manager should handle video/m4v MIME type.
Merge commit '208360b22db7bdd940a7005fd44135e8916742af' into eclair-mr2-plus-aosp

* commit '208360b22db7bdd940a7005fd44135e8916742af':
  Fix for b/2164520: Download manager should handle video/m4v MIME type.
2009-10-19 09:42:07 -07:00
Ben Murdoch
208360b22d Fix for b/2164520: Download manager should handle video/m4v MIME type.
The fix relaxes our processing of the content-disposition header by allowing unquoted filenames, and adds the m4v type to the MIME type map incase the content-disposition header was not specified.

Change-Id: Iaab0c5b17991a2c05eff5db01babe084444fd3b7
2009-10-19 17:22:59 +01:00
Marc Blank
73b4234fad am eab82c3c: Merge change I44bbc36d into eclair-mr2
Merge commit 'eab82c3c8c9dd88ff7267c154b415558d8e5c206' into eclair-mr2-plus-aosp

* commit 'eab82c3c8c9dd88ff7267c154b415558d8e5c206':
  Add htm and html extensions to the map as "text/html"
2009-10-17 09:29:17 -07:00
Android (Google) Code Review
eab82c3c8c Merge change I44bbc36d into eclair-mr2
* changes:
  Add htm and html extensions to the map as "text/html"
2009-10-17 12:20:42 -04:00
Fred Quintana
fbbe2cd28a am 055e4ea5: Merge change Ief544bc6 into eclair-mr2
Merge commit '055e4ea56c42e714dc471d86311f64437f4ed786' into eclair-mr2-plus-aosp

* commit '055e4ea56c42e714dc471d86311f64437f4ed786':
  fix grammar in the grant permissions UI
2009-10-16 11:26:20 -07:00
Android (Google) Code Review
055e4ea56c Merge change Ief544bc6 into eclair-mr2
* changes:
  fix grammar in the grant permissions UI
2009-10-16 14:16:13 -04:00
Marc Blank
3905e87e90 Add htm and html extensions to the map as "text/html"
* Fixes #2192935
* Exchange attachment handling depends on MimeTypeMap to determine the
  mime type of attachments based on their file extension

Change-Id: I44bbc36d7a5aa0800f072553274346d4547f8d4c
2009-10-16 10:22:08 -07:00
Mike Lockwood
5e6aa492b7 am 2086152c: am f55aa972: Merge change I01935be3 into eclair
Merge commit '2086152c1b60ad3bfe85c1ddc3871cff77e6da1b' into eclair-mr2-plus-aosp

* commit '2086152c1b60ad3bfe85c1ddc3871cff77e6da1b':
  Remove PowerManager.setAutoBrightness()
2009-10-16 09:48:30 -07:00
Mike Lockwood
2086152c1b am f55aa972: Merge change I01935be3 into eclair
Merge commit 'f55aa972f9911c6aafc9fbdb736bdec11e004542' into eclair-mr2

* commit 'f55aa972f9911c6aafc9fbdb736bdec11e004542':
  Remove PowerManager.setAutoBrightness()
2009-10-16 09:38:03 -07:00
Android (Google) Code Review
f55aa972f9 Merge change I01935be3 into eclair
* changes:
  Remove PowerManager.setAutoBrightness()
2009-10-16 12:29:15 -04:00
Mike Lockwood
dc3494e3d8 Remove PowerManager.setAutoBrightness()
We will use the System.SCREEN_BRIGHTNESS_MODE Settings value instead.
Add SCREEN_BRIGHTNESS_MODE_MANUAL and SCREEN_BRIGHTNESS_MODE_AUTOMATIC constants.

Change-Id: I01935be3fcb48cf76392d2c594205cb47babc5b2
Signed-off-by: Mike Lockwood <lockwood@android.com>
2009-10-16 07:42:26 -07:00
Cary Clark
39e6773431 do not merge: fix copy/paste using trackball on passion
This fix is alrady in mr2. It does not affect sholes --
this is a trackball only bug.

The selection caret and arrow now take the scale factor and
the height of the title bar into account when preparing the
canvas for drawing.

Clicking the trackball at the end of selecting text no longer
sends a click event.

Requires a companion fix in external/webkit
Fixes http://b/issue?id=2187591
2009-10-16 09:27:47 -04:00
Patrick Scott
93968f43af am e1f43dad: Share chunks between all ByteArrayBuilders.
Merge commit 'e1f43dadb9a1f0744f7e24373ca796c7a8ca2b12' into eclair-mr2-plus-aosp

* commit 'e1f43dadb9a1f0744f7e24373ca796c7a8ca2b12':
  Share chunks between all ByteArrayBuilders.
2009-10-16 05:31:59 -07:00
Patrick Scott
e1f43dadb9 Share chunks between all ByteArrayBuilders.
If a single ByteArrayBuilder accumulates many chunks, it is possible that many
of those chunks will not be reused and will just take up memory in the pool. If
the pool is shared across all instances, fewer chunks need to be allocated. This
allows a site like http://www.606studios.com/bendisboard/showthread.php?t=170286
to load without crashing due to OOM.

The shared pool contains SoftReferences to each chunk. If the vm feels memory
pressure, it is allowed to mark these references for collection. Before
accessing the pool of chunks, I remove any queued references from the pool.

Cleanup ByteArrayBuilder a little by removing unused methods and fields.
Document some synchronization spots in LoadListener and add a lock when
downloading a certificate.

Bug: 1637965
2009-10-16 08:07:29 -04:00
Mike Lockwood
8ab456b3fc am df284aa5: am 37a13208: Add separate configuration flag for hardware ALS support.
Merge commit 'df284aa534bd5611684604c469c04b4db6bb42c7' into eclair-mr2-plus-aosp

* commit 'df284aa534bd5611684604c469c04b4db6bb42c7':
  Add separate configuration flag for hardware ALS support.
2009-10-15 19:14:32 -07:00
Romain Guy
49f8a0ee91 am 7d4134a1: am 173a25f6: Merge change I0d74deb6 into eclair
Merge commit '7d4134a1a67872c056d05330b1453395a7c8c4d1' into eclair-mr2-plus-aosp

* commit '7d4134a1a67872c056d05330b1453395a7c8c4d1':
  Fix possible NPE in the code that restores widgets' state.
2009-10-15 19:13:51 -07:00
Mike Lockwood
df284aa534 am 37a13208: Add separate configuration flag for hardware ALS support.
Merge commit '37a13208c93bbe00cf233baf1ebcd6e081972a27' into eclair-mr2

* commit '37a13208c93bbe00cf233baf1ebcd6e081972a27':
  Add separate configuration flag for hardware ALS support.
2009-10-15 19:06:52 -07:00
Mike Lockwood
37a13208c9 Add separate configuration flag for hardware ALS support.
A new flag config_hardware_automatic_brightness_available indicates
that the device has hardware support for automatic screen brightness management,
while config_automatic_brightness_available now indicates that automatic
brightness mode is available in general.

If config_automatic_brightness_available is true but config_hardware_automatic_brightness_available is false,
then automatic brightness mode support in PowerManager support will be used.

Bug b/2015734 (Ambient light sensor support in power manager)

Change-Id: I6cd888252043dd63df3c25a1d14c21a04a91ad28
Signed-off-by: Mike Lockwood <lockwood@android.com>
2009-10-15 19:58:33 -04:00
Romain Guy
7d4134a1a6 am 173a25f6: Merge change I0d74deb6 into eclair
Merge commit '173a25f670e0e9cba2eb78d7c93bc1c0fc70b725' into eclair-mr2

* commit '173a25f670e0e9cba2eb78d7c93bc1c0fc70b725':
  Fix possible NPE in the code that restores widgets' state.
2009-10-15 15:42:05 -07:00
Romain Guy
a8a720d8cd Fix possible NPE in the code that restores widgets' state.
Bug #2189714
Reviewed by: ryanpc

Change-Id: I0d74deb6dc8e90e3b0eafd6b3c16b0c557c72873
2009-10-15 15:09:26 -07:00
Fred Quintana
5edb466a62 fix grammar in the grant permissions UI 2009-10-15 13:59:22 -07:00
Leon Scroggins
f6411533ef am be3feda4: Do not show soft keyboard for readonly textfields.
Merge commit 'be3feda46eac18a05aaea47d7ef34b611f8be6be' into eclair-mr2-plus-aosp

* commit 'be3feda46eac18a05aaea47d7ef34b611f8be6be':
  Do not show soft keyboard for readonly textfields.
2009-10-15 13:07:40 -07:00
Cary Clark
800ca40dfa am 9f208824: Merge change I7f97011b into eclair-mr2
Merge commit '9f2088240272086cd9eb94d01b1872a1088b76f2' into eclair-mr2-plus-aosp

* commit '9f2088240272086cd9eb94d01b1872a1088b76f2':
  check for native initialization before calling public function
2009-10-15 12:48:17 -07:00
Leon Scroggins
be3feda46e Do not show soft keyboard for readonly textfields.
Part of a fix for http://b/issue?id=2159869.  The request to show
the soft input has been moved to nativeTextInputMotionUp, where it
can check if the input field is readOnly.  This way it is also
handled by shortPressOnTextField, for when a user shortpresses
on the field.
2009-10-15 15:44:37 -04:00
Android (Google) Code Review
9f20882402 Merge change I7f97011b into eclair-mr2
* changes:
  check for native initialization before calling public function
2009-10-15 15:41:06 -04:00
Cary Clark
7f97011b55 check for native initialization before calling public function
Added more checks where it is possible to call a native function
after creating a WebView but before the native side is initialized.

These cases can be triggered by the monkey.

Fixes http://b/issue?id=2187719
2009-10-15 15:29:08 -04:00
Fred Quintana
efe1910b37 am 4874dcd4: Merge change I1a23191b into eclair-mr2
Merge commit '4874dcd417d7a07a8e802709c5d6895dc408d422' into eclair-mr2-plus-aosp

* commit '4874dcd417d7a07a8e802709c5d6895dc408d422':
  fix build
2009-10-15 11:41:21 -07:00
Android (Google) Code Review
4874dcd417 Merge change I1a23191b into eclair-mr2
* changes:
  fix build
2009-10-15 14:33:39 -04:00
Fred Quintana
1a23191bbd fix build 2009-10-15 11:31:30 -07:00
Tom Taylor
a5adb63398 am 662e4991: Merge change I6719d39d into eclair-mr2
Merge commit '662e49912a0a6e2d3c33c2fef72309b165d775eb' into eclair-mr2-plus-aosp

* commit '662e49912a0a6e2d3c33c2fef72309b165d775eb':
  Fix alert dialog separator
2009-10-15 11:22:26 -07:00
Android (Google) Code Review
662e49912a Merge change I6719d39d into eclair-mr2
* changes:
  Fix alert dialog separator
2009-10-15 14:15:03 -04:00
Cary Clark
fc52737ecc am badd8399: fix copy/paste using trackball on passion
Merge commit 'badd8399ca803f48ca43658b49c1cdcf0e3ec250' into eclair-mr2-plus-aosp

* commit 'badd8399ca803f48ca43658b49c1cdcf0e3ec250':
  fix copy/paste using trackball on passion
2009-10-15 11:02:27 -07:00
Tom Taylor
6719d39db1 Fix alert dialog separator
Update the line that separates the alert dialog's title from a custom view
with the correct asset to match the rest of the UI.
2009-10-15 11:01:26 -07:00
Cary Clark
badd8399ca fix copy/paste using trackball on passion
This fix should be considered for passion mr1, but
does not affect sholes -- this is a trackball only bug.

The selection caret and arrow now take the scale factor and
the height of the title bar into account when preparing the
canvas for drawing.

Clicking the trackball at the end of selecting text no longer
sends a click event.

Requires a companion fix in external/webkit
Fixes http://b/issue?id=2187591
2009-10-15 13:55:06 -04:00
Fred Quintana
033696e059 am 70d71fdc: Merge change Ib839afc3 into eclair-mr2
Merge commit '70d71fdcbf365ed148f2f4252a6975851424637e' into eclair-mr2-plus-aosp

* commit '70d71fdcbf365ed148f2f4252a6975851424637e':
  remove the bind helper and bind directly
2009-10-15 10:24:29 -07:00
Android (Google) Code Review
70d71fdcbf Merge change Ib839afc3 into eclair-mr2
* changes:
  remove the bind helper and bind directly
2009-10-15 13:16:31 -04:00
Fred Quintana
3ff0a5e55d am d753f070: Merge change I5d199964 into eclair-mr2
Merge commit 'd753f070f73e41bcd316c562e3b807aaf4bf1017' into eclair-mr2-plus-aosp

* commit 'd753f070f73e41bcd316c562e3b807aaf4bf1017':
  add an IPC for sync initialization
2009-10-15 09:50:40 -07:00
Android (Google) Code Review
d753f070f7 Merge change I5d199964 into eclair-mr2
* changes:
  add an IPC for sync initialization
2009-10-15 12:43:23 -04:00
Christian Sonntag
144c8eb7ab am e54ebd8c: Merge change I647ae75e into eclair-mr2
Merge commit 'e54ebd8c4f589a0a4a257a8d79b288dda67f3f8c' into eclair-mr2-plus-aosp

* commit 'e54ebd8c4f589a0a4a257a8d79b288dda67f3f8c':
  Add Gservice for vending_restore_window, this determines the duration after first setup, during which we do not reconcile backup apps.
2009-10-14 18:11:22 -07:00
Android (Google) Code Review
e54ebd8c4f Merge change I647ae75e into eclair-mr2
* changes:
  Add Gservice for vending_restore_window, this determines the duration after first setup, during which we do not reconcile backup apps. after that apps restored via market/backup will be treated just like any other app and being synced with the server state.
2009-10-14 19:53:09 -04:00
Daisuke Miyakawa
ca802b6ed5 am 8b12144d: Merge change I170c8251 into eclair-mr2
Merge commit '8b12144dad94bc0807e20590d72b4aadc56189d4' into eclair-mr2-plus-aosp

* commit '8b12144dad94bc0807e20590d72b4aadc56189d4':
  Add tests and fix vCard code.
2009-10-14 16:46:09 -07:00
Daisuke Miyakawa
99a0a2cd73 Add tests and fix vCard code.
Now, basic tests are almost ready.

TODO:
- importer test toward multiple vCard input (though it was tested with real usage)
- exporter tests for multiple composition
- tests with non-Ascii
- tests with special types like TYPE_DOCOMO

ISSUE:
In order to fully check the validity of exporter, we may have to develop
some vCard importer which rejects vCard which is valid but a kind of dubious.

Internal Issue Number: 2160039
2009-10-14 16:07:40 -07:00
Fred Quintana
e7424ffdaf add an IPC for sync initialization 2009-10-14 16:06:39 -07:00
Fred Quintana
b839afc33e remove the bind helper and bind directly 2009-10-14 15:57:28 -07:00
Fred Quintana
4a7ab6c24c am c4989b1b: update the authtoken permission granting UI
Merge commit 'c4989b1b75848acbeaf53850fbcfbf2f8812e325' into eclair-mr2-plus-aosp

* commit 'c4989b1b75848acbeaf53850fbcfbf2f8812e325':
  update the authtoken permission granting UI
2009-10-14 15:43:20 -07:00
Nick Pelly
aeed585d19 am 43f2b4e9: am 53f33d84: Revert "Remove STOPSHIP comment."
Merge commit '43f2b4e9c6811e0411446336ac4118565aa8eb88' into eclair-mr2-plus-aosp

* commit '43f2b4e9c6811e0411446336ac4118565aa8eb88':
  Revert "Remove STOPSHIP comment."
2009-10-14 15:43:13 -07:00
Christian Sonntag
647ae75e57 Add Gservice for vending_restore_window, this determines the duration after first setup, during which we do not reconcile backup apps.
after that apps restored via market/backup will be treated just like any other app and being synced with the server state.
2009-10-14 15:26:08 -07:00
Fred Quintana
c4989b1b75 update the authtoken permission granting UI
http://b/issue?id=2165284
2009-10-14 15:24:46 -07:00