61682 Commits

Author SHA1 Message Date
Jesse Hall
564f16a8d7 Fix statusbar crash on devices with no Bluetooth
Change-Id: Ib2290f9cde54d0d52c2692b11b0232848bbbc8b0
2011-12-05 11:10:32 -08:00
Jesse Hall
f57c138886 Merge "SurfaceFlinger: fix layer removal race condition" into ics-mr1 2011-12-02 18:31:03 -08:00
Robert Greenwalt
2a7b5ab16a Merge "Be careful sharing connections when dun is in play" into ics-mr1 2011-12-02 16:52:29 -08:00
Robert Greenwalt
7cb88dda5b Be careful sharing connections when dun is in play
A request for a DUN connection should only use the carriers requested dun connection.  Don't
share another connection unless it matches the carriers settings.

bug:5701374
Change-Id: I75a65fcfce1b218bd9ca4ce2ab85cbe850813321
2011-12-02 16:42:18 -08:00
Gilles Debunne
2f1e1e4ab9 Merge "Handle animations in Views' rectangle clipping methods." into ics-mr1 2011-12-02 15:28:56 -08:00
John Reck
43bc6b094e Merge "Fix updateDoubleTapZoom logic" into ics-mr1 2011-12-02 14:47:04 -08:00
Mike Lockwood
1a3ece9f87 Merge "MTP: Add support for restricting PTP to only certain subdirectories of the storage DO NOT MERGE" into ics-mr1 2011-12-02 13:20:49 -08:00
Mike Lockwood
7f87d9cf66 Merge "MTP: Don't attempt to read more than 16K at a time from the MTP driver DO NOT MERGE" into ics-mr1 2011-12-02 13:20:39 -08:00
Chia-chi Yeh
25bcbbb597 am 431c3e4c: Merge "Documentation for the VPN sample for ICS SDK. Staging server: http://fredchung.i:9999/resources/samples/ToyVpn/index.html" into ics-mr0
* commit '431c3e4c7e2103865a90501a552b4e5145ed3f35':
  Documentation for the VPN sample for ICS SDK. Staging server: http://fredchung.i:9999/resources/samples/ToyVpn/index.html
2011-12-02 12:46:51 -08:00
Chia-chi Yeh
431c3e4c7e Merge "Documentation for the VPN sample for ICS SDK. Staging server: http://fredchung.i:9999/resources/samples/ToyVpn/index.html" into ics-mr0 2011-12-02 12:45:44 -08:00
Jesse Hall
6d90c1c6fe Merge "Disable GLES20Canvas on emu w/o native GL" into ics-mr1 2011-12-02 12:33:20 -08:00
Mike Lockwood
7944c1b19f MTP: Add support for restricting PTP to only certain subdirectories of the storage DO NOT MERGE
Bug: 5527220

Change-Id: I81d6de590ea3002118ba46eb4b6d5fe9061c998c
Signed-off-by: Mike Lockwood <lockwood@google.com>
2011-12-02 15:12:47 -05:00
Mike Lockwood
7a1ad63d16 MTP: Don't attempt to read more than 16K at a time from the MTP driver DO NOT MERGE
This could happen sometimes if other operations increased the size of the
data packet buffer to > 16K

Change-Id: I10f85f0ce32df39f46b0a984361958c0a13f6800
Signed-off-by: Mike Lockwood <lockwood@google.com>
2011-12-02 15:12:30 -05:00
Roman Nurik
55347e65e2 am cd0e446d: Merge "Reduce file size for ADL presentation shareable." into ics-mr0
* commit 'cd0e446dc8de4b639df889ec3b5754bea60d752a':
  Reduce file size for ADL presentation shareable.
2011-12-02 11:59:07 -08:00
Roman Nurik
cd0e446dc8 Merge "Reduce file size for ADL presentation shareable." into ics-mr0 2011-12-02 11:57:03 -08:00
Roman Nurik
5c8e690edf Reduce file size for ADL presentation shareable.
Change-Id: I700959f3c15609c730c63d99953b890a93105cea
2011-12-02 11:41:04 -08:00
Amith Yamasani
afd0108679 Merge "Further volume improvements." into ics-mr1 2011-12-02 11:22:32 -08:00
Gilles Debunne
f96aa3b197 Merge "(de)activating spell check taken into account immediately" into ics-mr1 2011-12-02 10:45:25 -08:00
Jesse Hall
8a7c940eff SurfaceFlinger: fix layer removal race condition
Layer::lockPageFlip() and layer::onRemove() could be called on
different threads and race such that lockPageFlip() successfully
called mSurfaceTexture->updateTexImage() but then gets NULL back from
mSurfaceTexture->getCurrentBuffer(), leading to a crash.

This change moves Layer::onRemove() calls to
SurfaceFlinger::commitTransaction() so they happen after the Layer is
done being drawn from and only happen on the main surfaceflinger
thread.

Change-Id: I4b550caadff4cc1878d7c3bca6129193fb0c713e
2011-12-02 10:03:25 -08:00
Jesse Hall
4406345cd6 Disable GLES20Canvas on emu w/o native GL
When the emulator is run without '-gpu on', GLES20 isn't supported,
so claiming GLES20Canvas is available will lead to catastrophic
failure. This change makes GLES20Canvas available when compiled in
and either not running on the emulator, or running on the emulator
with native GL acceleration enabled.

Change-Id: I89c944f9e3c9585224f5aa0877335ea48ea4a468
2011-12-02 09:35:42 -08:00
Hong Teng
613ed4c69a Merge "Fixd for 5490443 Native crash while exporting a video - Add new onError callback to PreviewProgressListener, which is used to indicate video editor application for the error that has occurred during priviewing. With this modification, the application must implement the onError method, and then VideoEditorPreviewTest.java is changed accordingly." into ics-mr1 2011-12-02 09:32:02 -08:00
Ben Cheng
e21dabf654 Merge "Initialize bwr.read_buffer in IPCThreadState::talkWithDriver." into ics-mr1 2011-12-01 22:05:07 -08:00
Eric Laurent
0d3a2e9339 Merge "AudioService: strengthen A2DP device detection" into ics-mr1 2011-12-01 20:34:08 -08:00
John Reck
059832790d Fix updateDoubleTapZoom logic
Bug: 5698099

Change-Id: I83578e57cf809cbe7781d988302f0925dfddec80
2011-12-01 19:28:41 -08:00
Dianne Hackborn
bfb3dec22d Merge "More social integration." into ics-mr1 2011-12-01 18:48:32 -08:00
Dianne Hackborn
a3d487cb13 More social integration.
Change-Id: I9be09e08bda5db6c05f5beabc380708a11ead43b
2011-12-01 18:42:24 -08:00
Gilles Debunne
a49ba2f391 (de)activating spell check taken into account immediately
Test for a change in the spell checker activate state on every
spell check. Add/remove suggestion spans accordingly.

Change-Id: I750f30b81464b85cebc695bdb0449ec038fc17df
2011-12-01 17:41:17 -08:00
Ben Cheng
0450570879 Initialize bwr.read_buffer in IPCThreadState::talkWithDriver.
I/valgrind( 1309): ==1310== Syscall param
ioctl(BINDER_WRITE_READ).read_buffer points to uninitialised byte(s)
I/valgrind( 1309): ==1310==    at 0x480E670: __ioctl (__ioctl.S:10)
I/valgrind( 1309): ==1310==  Address 0xbda651b4 is on thread 1's stack

Change-Id: I02893df7b5786b6b2dbd9659f5706d7171295ab2
2011-12-01 17:11:32 -08:00
Stephen Hines
976ae27270 Add support for handling a bitcode wrapper to librs.
BUG=5425905

Change-Id: I75676060703df6d9043b287fea900c4379455ee2
2011-12-01 16:37:00 -08:00
Gilles Debunne
335c4e6cb2 Broken build. New methods made private.
Change-Id: Ia123ab4ddb1fe93bcd053c3ea5bf6b87c7204640
2011-12-01 15:36:08 -08:00
Amith Yamasani
2ef6f1bb56 Further volume improvements.
- Remove silent mode from Power menu
- Show volume dialog on lockscreen
- Allow beeps when adjusting volume in lockscreen

Bug: 5586083
Change-Id: I93052a8ec5004c784f20e04488af9382d495e711
2011-12-01 15:05:54 -08:00
Gilles Debunne
58d8953958 Merge "Scroll performance improved in multiline TextEdit" into ics-mr1 2011-12-01 15:04:35 -08:00
Gilles Debunne
eb189d399a Merge "Performance improvement in TextView" into ics-mr1 2011-12-01 15:03:55 -08:00
Gilles Debunne
09cbff0294 Merge "Better handles' visibility test" into ics-mr1 2011-12-01 15:03:27 -08:00
Gilles Debunne
cea45132e3 Handle animations in Views' rectangle clipping methods.
getChildVisibleRect and getLocationInWindow do not take the new
mTransformationInfo View attribute.

As a result, these methods return invalid value during an animation
Bug 5638710

Changes in Patch Set 2:
- temporary allocations removed using static thread local variables (method
calls are NOT reentrant).

- scroll should be handled *before* applying the transformation matrix.
Fixed the call order in View#getLocationInWindow()

Patch set 4: fix from comments.
Patch set 5: <p>s

Change-Id: I15dc44c0659305d9029c59a47aba3a738bb35ae1
2011-12-01 14:55:50 -08:00
Winson Chung
cea32ecd3a Merge "Adding a sound when you take a screenshot. (Bug 5617734)" into ics-mr1 2011-12-01 14:55:41 -08:00
Winson Chung
8d513eaef7 Adding a sound when you take a screenshot. (Bug 5617734)
Change-Id: I7f253adddd09da65481081a4ca22f043d3325d65
2011-12-01 14:39:44 -08:00
Kenny Root
5a7c91769f Merge "Fix free_cache to actually work" into ics-mr1 2011-12-01 14:14:22 -08:00
Roman Nurik
a7d825dddc am c3998ced: Merge "Update widget design guidelines for padding and 8dp." into ics-mr0
* commit 'c3998ced746ee97bc5f10a9de1b2848f85c8711e':
  Update widget design guidelines for padding and 8dp.
2011-12-01 13:42:23 -08:00
Roman Nurik
c3998ced74 Merge "Update widget design guidelines for padding and 8dp." into ics-mr0 2011-12-01 13:40:38 -08:00
Matthew Xie
1a1be44c5b Merge "Unlink the Binder DeathRecipient when removing a Bluetooth service record" into ics-mr1 2011-12-01 13:32:19 -08:00
Roman Nurik
061cf70da9 Update widget design guidelines for padding and 8dp.
Instead of using layout_margin for widget margins, the recommendation is to
now use padding. Additionally, update all docs to mention an example default
padding of 8dp instead of 15 or 16dp.

Change-Id: I330aedc56986dbb31a70260279ad2f6668c67c92
2011-12-01 13:21:14 -08:00
Svetoslav Ganov
e9f24a4302 Merge "Fix memory leaks in the accessibility layer." into ics-mr1 2011-12-01 12:57:12 -08:00
Dianne Hackborn
55e81bd0f2 Merge "Improve how we manage the previous app." into ics-mr1 2011-12-01 12:47:43 -08:00
Dianne Hackborn
50685606cf Improve how we manage the previous app.
Setting it when a new activity is being resumed is too soon, because
things like an activity launching an exiting (without being seen by
the user) can knock out the real previous app that we want.

So now we set it when an activity is stopped.  At this point it is
going to move from the preceptible to background oom adj, so it is
a good point to determine whether it should be a previous app to
instead put it to that oom adj.  This also avoids things like
activities that start and immediately finish from impacting the
previous app.

Further, we keep track of the time each activity was last shown, and
use this to further filter what is set as the previous app.

Change-Id: I72d1cac4de0cc2d4598170296028f11b06918d4f
2011-12-01 12:23:37 -08:00
Daniel Sandler
b73dc9c852 Merge "Add copious navigation bar info to SystemUI dumps." into ics-mr1 2011-12-01 12:09:51 -08:00
Jason Simmons
c980a495a6 Unlink the Binder DeathRecipient when removing a Bluetooth service record
The fix holds a reference to the Reaper objects, so that they don't get GCed
and cause the error - unlink not called on death recipients.
bug 5602314

Change-Id: Ib8a9e254d7c9ebe9d54f5c10b3daa31d062b4df0
2011-12-01 12:06:50 -08:00
Bill Gruber
715a3c52cc am 92ad16d3: Merge "Cherrypick from HCMR2 Change ID: Id849cb25098fef76c96c4935db31ebc1422d74d8 IAB doc update: CSV import feature Also fixed Bug 5221766" into ics-mr0
* commit '92ad16d342aa4d39bad33600161b3799b84716f3':
  Cherrypick from HCMR2 Change ID: Id849cb25098fef76c96c4935db31ebc1422d74d8 IAB doc update: CSV import feature Also fixed Bug 5221766
2011-12-01 11:54:57 -08:00
Scott Main
a8fa89f7f4 am 8f3993b1: Merge "docs: dashboard update for 12/1" into ics-mr0
* commit '8f3993b12b52ac5d94d84376ec4f42b130018429':
  docs: dashboard update for 12/1
2011-12-01 11:54:55 -08:00
Bill Gruber
92ad16d342 Merge "Cherrypick from HCMR2 Change ID: Id849cb25098fef76c96c4935db31ebc1422d74d8 IAB doc update: CSV import feature Also fixed Bug 5221766" into ics-mr0 2011-12-01 11:53:23 -08:00