drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
64,722 Commits 1 Branch 0 Tags
Commit Graph

64722 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Mike Lockwood
3309386a1b AudioService: Send broadcasts when master volume and mute state change 
Change-Id: I7eb5041f0c14f419317e29ea6fa7faa9159cf165
Signed-off-by: Mike Lockwood <lockwood@google.com>
 2011-12-05 18:47:38 -08:00
Jesse Hall
18bd6bdbf0 am f57c1388: Merge "SurfaceFlinger: fix layer removal race condition" into ics-mr1 
* commit 'f57c1388860486a70cc773f2cfeaa3ea3b38a473':
  SurfaceFlinger: fix layer removal race condition
 2011-12-02 18:32:22 -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
9ef703692a am 2a7b5ab1: Merge "Be careful sharing connections when dun is in play" into ics-mr1 
* commit '2a7b5ab16af697f386ad7ae346e1bf9229086fa8':
  Be careful sharing connections when dun is in play
 2011-12-02 16:54:27 -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
e64f4abb29 am 2f1e1e4a: Merge "Handle animations in Views\' rectangle clipping methods." into ics-mr1 
* commit '2f1e1e4ab9ca20920d85574317c9d7c9e9e73161':
  Handle animations in Views' rectangle clipping methods.
 2011-12-02 15:31:17 -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
33caf2bd28 am 43bc6b09: Merge "Fix updateDoubleTapZoom logic" into ics-mr1 
* commit '43bc6b094edda6baa8123115a33afaf454525376':
  Fix updateDoubleTapZoom logic
 2011-12-02 14:49:22 -08:00
John Reck
43bc6b094e Merge "Fix updateDoubleTapZoom logic" into ics-mr1 2011-12-02 14:47:04 -08:00
Mike Lockwood
15cf022c70 am 1a3ece9f: Merge "MTP: Add support for restricting PTP to only certain subdirectories of the storage DO NOT MERGE" into ics-mr1 
* commit '1a3ece9f871c94eb524543ae618a2a1c88cab2cd':
  MTP: Add support for restricting PTP to only certain subdirectories of the storage DO NOT MERGE
 2011-12-02 13:22:28 -08:00
Mike Lockwood
d562cbf6f8 am 7f87d9cf: Merge "MTP: Don\'t attempt to read more than 16K at a time from the MTP driver DO NOT MERGE" into ics-mr1 
* commit '7f87d9cf666c38b9f43b7b2d99acbd9c8f91d8d1':
  MTP: Don't attempt to read more than 16K at a time from the MTP driver DO NOT MERGE
 2011-12-02 13:22:26 -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
cdf9e4c098 am 25bcbbb5: 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 '25bcbbb5971e2832c3020ee406b27d641d4ca05b':
  Documentation for the VPN sample for ICS SDK. Staging server: http://fredchung.i:9999/resources/samples/ToyVpn/index.html
 2011-12-02 12:49:42 -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
f6544bde14 am 6d90c1c6: Merge "Disable GLES20Canvas on emu w/o native GL" into ics-mr1 
* commit '6d90c1c6fedc7add177418324ba5e591af543fa4':
  Disable GLES20Canvas on emu w/o native GL
 2011-12-02 12:35:20 -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
f6debe9f88 am 55347e65: am cd0e446d: Merge "Reduce file size for ADL presentation shareable." into ics-mr0 
* commit '55347e65e229ed63f7e18cb5b82639174c0f54bb':
  Reduce file size for ADL presentation shareable.
 2011-12-02 12:01:25 -08: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
54a7962590 am afd01086: Merge "Further volume improvements." into ics-mr1 
* commit 'afd01086795c7c1f6950a709180b2361625b8b6a':
  Further volume improvements.
 2011-12-02 11:23:50 -08:00
Amith Yamasani
afd0108679 Merge "Further volume improvements." into ics-mr1 2011-12-02 11:22:32 -08:00
Gilles Debunne
15daf351c4 am f96aa3b1: Merge "(de)activating spell check taken into account immediately" into ics-mr1 
* commit 'f96aa3b197b96f9cb276485420c09a7b36606599':
  (de)activating spell check taken into account immediately
 2011-12-02 10:47:18 -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
1109fe9d81 am 613ed4c6: 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 applicati 
* commit '613ed4c69a53e6ffb1f104c7d45a0c6dd41c8eb0':
  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.
 2011-12-02 09:33:47 -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
f04c71b9ed am e21dabf6: Merge "Initialize bwr.read_buffer in IPCThreadState::talkWithDriver." into ics-mr1 
* commit 'e21dabf654e3d90e50e95174d5e9670bc930c194':
  Initialize bwr.read_buffer in IPCThreadState::talkWithDriver.
 2011-12-01 22:06:35 -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
c1f069bb40 am 0d3a2e93: Merge "AudioService: strengthen A2DP device detection" into ics-mr1 
* commit '0d3a2e93394efa4729e5c29ff4515f9f2644b8c3':
  AudioService: strengthen A2DP device detection
 2011-12-01 20:35:32 -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
9dbe338930 am bfb3dec2: Merge "More social integration." into ics-mr1 
* commit 'bfb3dec22dd397b57c8bbc1d6d18ed98cd413b10':
  More social integration.
 2011-12-01 18:50:38 -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
Stephen Hines
e4323410f0 am 976ae272: Add support for handling a bitcode wrapper to librs. 
* commit '976ae27270a64c5abeb380d6e61d6d71f29b9433':
  Add support for handling a bitcode wrapper to librs.
 2011-12-01 18:11:16 -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
93b3409e78 am 335c4e6c: Broken build. New methods made private. 
* commit '335c4e6cb2094c7cbd6039e0c7915702b69e7657':
  Broken build. New methods made private.
 2011-12-01 16:06:44 -08:00
Gilles Debunne
335c4e6cb2 Broken build. New methods made private. 
Change-Id: Ia123ab4ddb1fe93bcd053c3ea5bf6b87c7204640
 2011-12-01 15:36:08 -08:00
Gilles Debunne
0b68624c2a am 58d89539: Merge "Scroll performance improved in multiline TextEdit" into ics-mr1 
* commit '58d8953958ce452c5080eaa582d7e5d2b5017398':
  Scroll performance improved in multiline TextEdit
 2011-12-01 15:07:57 -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
2910794810 am eb189d39: Merge "Performance improvement in TextView" into ics-mr1 
* commit 'eb189d399a459c2e1ad29e1beba70d1de9f447b3':
  Performance improvement in TextView
 2011-12-01 15:05:41 -08:00