59545 Commits

Author SHA1 Message Date
Romain Guy
f751210b4b Merge "Fix the build" 2011-10-11 14:51:18 -07:00
Romain Guy
4db2504ada Fix the build
Change-Id: I3071feab62abee7393557ceb920786b476fb0b02
2011-10-11 14:48:56 -07:00
Romain Guy
df61887feb Merge "Check whether an AsyncTask is created/executed on a looper thread." 2011-10-11 14:10:10 -07:00
Romain Guy
7498ccb6b9 Check whether an AsyncTask is created/executed on a looper thread.
Change-Id: I181b253c50a6579f35e61cd4b0c500379462e035
2011-10-11 14:09:27 -07:00
Romain Guy
bd3f526eab Merge "Correctly apply transforms when getting a TextureView's bitmap Bug #5439406" 2011-10-11 14:07:15 -07:00
Romain Guy
a9dc86b21d Correctly apply transforms when getting a TextureView's bitmap
Bug #5439406

Change-Id: I271a9a2e38f5b3600dc158f8f442a6b0893f472b
2011-10-11 14:06:21 -07:00
John Reck
baf8711684 Merge branch 'master' of ssh://android-git:29418/platform/frameworks/base 2011-10-11 13:49:59 -07:00
Nick Pelly
79425fd600 Merge "Remove deprecated (and hidden) enableForegroundNdefPush callback API's." 2011-10-11 12:39:46 -07:00
Jeff Brown
e69eaf5c6d Merge "Don't log BlockGuard violations on ENG builds." 2011-10-11 12:35:05 -07:00
Scott Main
c351ab4734 cherrypick from hc-mr2 Change-Id: Ia38b7c364a3a655faa5cc5d13e19c2dbbb12eee5
docs: add docs for new hardware feature constants

Change-Id: I1b5b7b37a85856d28db8ecf08b070f24312ccca2
2011-10-11 12:03:10 -07:00
Daniel Sandler
b545851dd5 Merge "Stop enabling all disabled status bar features from GlobalActions." 2011-10-11 12:01:15 -07:00
Jeff Brown
be7c29c9f7 Don't log BlockGuard violations on ENG builds.
We want to see CloseGuard violations in the log in ENG builds
because they indicate serious problems, but BlockGuard is
too noisy and is best viewed in the aggregate from the
drop box based tools.

Change-Id: I77d4d0a561a4299355c111d0ccb5a2147646245b
2011-10-11 11:35:23 -07:00
Svetoslav Ganov
0c9698aca5 Merge changes I67d080ab,Ia3d7a5ad
* changes:
  AdapterView does not set setCurrentItemIndex in accessibility event.
  AdapterView#isScrollableForAccessibility does not handle null adapter.
2011-10-11 11:30:45 -07:00
Ying Wang
384bf04a38 Merge "Remove non-module names from PRODUCT_PACKAGES" 2011-10-11 10:01:39 -07:00
The Android Open Source Project
99f36683a4 Reconcile with ics-factoryrom-release
Change-Id: Ibd1dca227b44e13538ea0b9f6aea45d180a010d3
2011-10-11 04:29:27 -07:00
Mathias Agopian
5c3bea7022 Merge "fix an issue where the screen could stay off" 2011-10-10 22:21:57 -07:00
Mathias Agopian
919139247c fix an issue where the screen could stay off
this would happen when toggling on/off/on very fast, the screen
could stay black (while the panel is on).

Bug: 5429724
Change-Id: Ic8aa6aff066e6267923c0d47ef65e314e7bb6d41
2011-10-10 22:18:55 -07:00
Jim Miller
12b6fa1da8 Merge "Fix 5386408: Fix battery state information propagation in Lock Screen" 2011-10-10 22:06:07 -07:00
Jim Miller
baa2812b37 Fix 5386408: Fix battery state information propagation in Lock Screen
This fixes a bug where Lock Screen would sometimes inappropriately show
"charged" if it took a while for Lock Screen to get an update on the
battery state.  It now starts with the state set to BATTERY_STATUS_UNKNOWN
so we properly update listeners when we finally get battery information
in handleBatteryUpdate().

Change-Id: I71018a233f38b2f897ff2e6592d7e310550fa016
2011-10-10 22:02:54 -07:00
The Android Automerger
10ff393a52 merge in ics-factoryrom-release history after reset to ics-factoryrom 2011-10-10 20:38:59 -07:00
Jim Miller
66360acc12 Merge "Fix 5249234: Add contentDescription to buttons on transport control on lock screen." 2011-10-10 20:06:29 -07:00
Dianne Hackborn
9f4021d86a Merge "Keep screen brightness at 0 while waiting for the UI to be displayed." 2011-10-10 19:16:52 -07:00
Dianne Hackborn
5f9532f47e Merge "Fix issue #5435470: SharedPreferencesImpl should read from file..." 2011-10-10 19:15:32 -07:00
Jim Miller
67e043db11 Fix 5249234: Add contentDescription to buttons on transport control on lock screen.
Change-Id: Ie4e9139e01c37a0d9542ff9996a84db0083b35ef
2011-10-10 19:11:06 -07:00
Mathias Agopian
9c518d1f16 Merge "Fix screen off animation when in landscape" 2011-10-10 19:05:23 -07:00
Mathias Agopian
b946a56b69 Fix screen off animation when in landscape
Change-Id: I4bc5b12d7a64a4bf8b9a851594be4d60b790d1ed
2011-10-10 19:02:07 -07:00
Dianne Hackborn
2e8fb73ec0 Fix issue #5435470: SharedPreferencesImpl should read from file...
...via BufferedInputStream

Change-Id: Ic14eff1e53b6f4a0de5f59bd97cd390eb908e3c6
2011-10-10 18:47:00 -07:00
Dianne Hackborn
474fd74b88 Keep screen brightness at 0 while waiting for the UI to be displayed.
Change-Id: I957135c5423db6d83f4f30232481a1b6d77165fa
2011-10-10 18:40:22 -07:00
Svetoslav Ganov
b2a9e21672 AdapterView does not set setCurrentItemIndex in accessibility event.
bug:5439637

Change-Id: I67d080abb4c14cad88b952e2f91d65e181b2029b
2011-10-10 18:15:49 -07:00
Jeff Sharkey
338140f734 Merge "Over-limit within handful of MTU's, update assets." 2011-10-10 17:47:46 -07:00
Svetoslav Ganov
f005a2c83b Merge "Adding accessibility support to the pattern lock." 2011-10-10 17:39:54 -07:00
Jake Hamby
6b1950cce1 Merge "Add "format" extra to SMS delivery report intents." 2011-10-10 17:34:15 -07:00
Christopher Tate
b765e45f00 Merge "Gracefully handle "needs init" transport errors at finish" 2011-10-10 17:27:05 -07:00
Svetoslav Ganov
54669f837a AdapterView#isScrollableForAccessibility does not handle null adapter.
1. If an AdapterView has no adapter and the view tries to fire an
   accessibility event we get a null pointer exception.

bug:5439321

Change-Id: Ia3d7a5ad852ef42422d10d8a62c4d3af6792313b
2011-10-10 17:18:24 -07:00
Jeff Sharkey
50e7e51d68 Over-limit within handful of MTU's, update assets.
Consider a network over-limit when it's measured usage is within a
handful of MTU's, since kernel completely drops packets that trigger
limit alert.

Update notification drawables.

Bug: 5433359, 5224629
Change-Id: I10b19cc34c34b47775904229829a25208cd85d25
2011-10-10 16:57:21 -07:00
Jake Hamby
32319dd852 Add "format" extra to SMS delivery report intents.
The MMS app was updated for multiple SMS dispatcher support, passing
the "format" extra into SmsMessage.createFromPdu() so that the PDU
is interpreted as the correct format (3GPP or 3GPP2).

This change adds the "format" extra to the intents that are sent for
SMS delivery reports. The MMS app is already expecting this extra, so
this change fixes a NPE that was introduced with the last change.

Bug: 5434052
Change-Id: I38b97f166c78d246d721ca1db8a4a18a2c6529bd
2011-10-10 16:56:58 -07:00
Justin Ho
882ed37471 Resolved conflicts for merge of 83cf0313 to master
Change-Id: Ib66ee7e34d0c4d845004bce635ee1ef300d3b344
2011-10-10 16:46:35 -07:00
Christopher Tate
e659fb9275 Gracefully handle "needs init" transport errors at finish
Although it's typical for a backup transport to report that it
needs an explicit initialization opportunity when the backup is
initiated, it can sometimes come to pass that the "needs init"
error condition is reported at backup *finish*.  In this case the
framework side was failing to properly reset all of the relevant
state.  The end result was to spin hard forever, holding wakelocks
and continually failing to actually perform the necessary init
operation, possibly continuing even after a reboot.  Fixed.

Bug 5434579

Change-Id: If1d72c338526e4019ea524c48a11e71e44e77f71
2011-10-10 16:34:50 -07:00
Amith Yamasani
2cba116c27 Merge "Don't show icon for power-off confirmation dialog." 2011-10-10 16:34:34 -07:00
Hiroshi Lockheimer
83cf031307 Merge "Ensuring previous sounds are named correctly Bug: 5416299" into ics-factoryrom 2011-10-10 16:34:23 -07:00
Jim Miller
2b78c7006a Merge "Fix 5406921: Register for receiving phone state changes when KGSVM gets created." 2011-10-10 16:30:06 -07:00
Steven Ross
51ee6a7ad9 Merge "Fixes 5429869 Only displaying FaceUnlock when window is focused" 2011-10-10 16:28:36 -07:00
Amith Yamasani
04b81c713e Don't show icon for power-off confirmation dialog.
Bug: 5380396
Change-Id: I57574b613d95885c829df729297b24be1c73b876
2011-10-10 16:24:48 -07:00
Dianne Hackborn
94e8471a95 Merge "Fix issue #5405788: Device continuously opening and closing..." 2011-10-10 16:08:05 -07:00
Svetoslav Ganov
a1a274f279 Merge "Accessibility text changed event text not populated." 2011-10-10 16:05:53 -07:00
Justin Ho
62dce9b574 Ensuring previous sounds are named correctly
Bug: 5416299

Change-Id: I0f2cd229be02908553368d6ff19977a0ebd3e613
2011-10-10 15:57:41 -07:00
The Android Open Source Project
b6eb58ef03 Reconcile with ics-factoryrom-release
Change-Id: I8642724549283dbcd3d104a35d5c659e5591682e
2011-10-10 15:39:42 -07:00
Romain Guy
b47232b4d5 Merge "Don't call saveLayer() when it's not required Bug #5435653" 2011-10-10 15:24:06 -07:00
Romain Guy
098ffcd521 Don't call saveLayer() when it's not required
Bug #5435653

saveLayer() can be extremely expensive on some GPU architectures. Avoiding
this call greatly improve the rendering performance of drawables with
strok + fill.

Change-Id: Ib414174ba05d5bad56d942b8e67ab784e7d60b9e
2011-10-10 15:23:32 -07:00
James Dong
50c31024e3 Merge "Support AMR as a file type so that it can be imported into movie studio" 2011-10-10 15:22:04 -07:00