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

62036 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Andreas Huber
07bacabe74 am f2e12498: Merge "Properly identify how much metadata we need to cache in order to instantiate" into ics-mr1 
* commit 'f2e1249846a17c69d728189a8dc67f37261f0a59':
  Properly identify how much metadata we need to cache in order to instantiate
 2011-12-05 12:03:41 -08:00
Andreas Huber
f2e1249846 Merge "Properly identify how much metadata we need to cache in order to instantiate" into ics-mr1 2011-12-05 12:01:26 -08:00
Andreas Huber
b8e651a675 Properly identify how much metadata we need to cache in order to instantiate 
the extractor without blocking (and therefore be able to abort).

Change-Id: Id2acdde897e02baaeabadae70b7c95b66c9041b3
related-to-bug: 5666532
 2011-12-05 11:34:43 -08:00
Dianne Hackborn
803caff1dc am 003c15d7: Merge "Fix issue #5614559: Registering surface error in..." into ics-mr1 
* commit '003c15d72ccd3856d5abfe6d66a2a40d0eca85bc':
  Fix issue #5614559: Registering surface error in...
 2011-12-05 10:42:51 -08:00
Dianne Hackborn
003c15d72c Merge "Fix issue #5614559: Registering surface error in..." into ics-mr1 2011-12-05 10:40:59 -08:00
Michael Kolb
32e914fc03 am 277cbe5a: Merge "set System UI visibility based on MediaController state" into ics-mr1 
* commit '277cbe5a951840558166020568fb1510285e2594':
  set System UI visibility based on MediaController state
 2011-12-05 09:26:21 -08:00
Michael Kolb
277cbe5a95 Merge "set System UI visibility based on MediaController state" into ics-mr1 2011-12-05 09:24:25 -08:00
Dianne Hackborn
61566cc193 Fix issue #5614559: Registering surface error in... 
...Background Replacement on Stingray

This is how I should have done it in the first place.  We get the
new surface from the window manager, and then just copy it in to
the constant Surface object we have for the holder.

Change-Id: I537a9e413829a18f689dfb46687014676b27156e
 2011-12-03 11:16:49 -08:00
Jesse Hall
a91e54fed6 am f57c1388: Merge "SurfaceFlinger: fix layer removal race condition" into ics-mr1 
* commit 'f57c1388860486a70cc773f2cfeaa3ea3b38a473':
  SurfaceFlinger: fix layer removal race condition
 2011-12-02 18:33:14 -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
00f1ac8001 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:04 -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
Michael Kolb
c07b678522 set System UI visibility based on MediaController state 
Bug: 5494143

    still doesn't remove the buttons in dimmed state,
    but at least dims them correctly

Change-Id: Idcfc10616d31f6ccf8cd84b706a17d048bf505a1
 2011-12-02 16:12:02 -08:00
Gilles Debunne
0c7e894e79 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:07 -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
6d3e51d4c4 am 43bc6b09: Merge "Fix updateDoubleTapZoom logic" into ics-mr1 
* commit '43bc6b094edda6baa8123115a33afaf454525376':
  Fix updateDoubleTapZoom logic
 2011-12-02 14:49:19 -08:00
John Reck
43bc6b094e Merge "Fix updateDoubleTapZoom logic" into ics-mr1 2011-12-02 14:47:04 -08:00
Mike Lockwood
9f3f3c2fbe 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:17 -08:00
Mike Lockwood
7bbc3c4bbe 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:15 -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
939a3dd4e7 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:48:35 -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
54cf27d7bb 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:22 -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
04bd27ebed 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:36 -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
f8dad0b37d am afd01086: Merge "Further volume improvements." into ics-mr1 
* commit 'afd01086795c7c1f6950a709180b2361625b8b6a':
  Further volume improvements.
 2011-12-02 11:24:03 -08:00
Amith Yamasani
afd0108679 Merge "Further volume improvements." into ics-mr1 2011-12-02 11:22:32 -08:00
Gilles Debunne
99019d5223 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:46 -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
5126f1d413 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:34:05 -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
f1a4c48b88 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:32 -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
6cfa9e6c50 am 0d3a2e93: Merge "AudioService: strengthen A2DP device detection" into ics-mr1 
* commit '0d3a2e93394efa4729e5c29ff4515f9f2644b8c3':
  AudioService: strengthen A2DP device detection
 2011-12-01 20:35:26 -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
48e0729680 am bfb3dec2: Merge "More social integration." into ics-mr1 
* commit 'bfb3dec22dd397b57c8bbc1d6d18ed98cd413b10':
  More social integration.
 2011-12-01 18:50:36 -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
88c02e8c5d 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:10:29 -08:00