ADHOC/replicant-frameworks_native
3
0
Fork 0
Code Issues 4 Pull Requests Releases Wiki Activity
41,069 Commits 2 Branches 0 Tags 54 MiB
481458b522
Commit Graph

41069 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Daniel Sandler
481458b522 am f66664a5: Merge "Fix sticky menu icon on tablet status bar." into ics-mr1 
* commit 'f66664a50e914e1cc5d66046cfc4c5b195a09eab':
  Fix sticky menu icon on tablet status bar.
 2011-12-05 19:04:13 -08:00
Daniel Sandler
a13e242710 Merge "Fix sticky menu icon on tablet status bar." into ics-mr1 2011-12-05 19:02:28 -08:00
Adam Powell
757108a9d2 am 9a856f4e: Merge "Drop API level for notification compatibility BG to 8 (from 10)" into ics-mr1 
* commit '9a856f4ee7b49f735e31b57a09bee2f033ce20a5':
  Drop API level for notification compatibility BG to 8 (from 10)
 2011-12-05 17:40:18 -08:00
Adam Powell
64fb290a92 Merge "Drop API level for notification compatibility BG to 8 (from 10)" into ics-mr1 2011-12-05 17:38:23 -08:00
Eric Laurent
19c54add1d am 7b6aff23: Merge "audioflinger: fix audio skipping over A2DP" into ics-mr1 
* commit '7b6aff23735a9ef8759c5ecb4427784413e9b85b':
  audioflinger: fix audio skipping over A2DP
 2011-12-05 17:22:58 -08:00
Eric Laurent
cb512470c5 Merge "audioflinger: fix audio skipping over A2DP" into ics-mr1 2011-12-05 17:20:53 -08:00
Fred Quintana
0a5867d5bd am b5f2dfbc: Merge "By default ICS allows two syncs to run in parallel. Make it only do one at a time for devices that don\'t have much RAM as defined by the call ActivityManager.isLargeRAM()" into ics-mr1 
* commit 'b5f2dfbc221d3dc799232e0ada3b6621d3d4d597':
  By default ICS allows two syncs to run in parallel. Make it only do one at a time for devices that don't have much RAM as defined by the call ActivityManager.isLargeRAM()
 2011-12-05 16:47:06 -08:00
Fred Quintana
9a6f415353 Merge "By default ICS allows two syncs to run in parallel. Make it only do one at a time for devices that don't have much RAM as defined by the call ActivityManager.isLargeRAM()" into ics-mr1 2011-12-05 16:45:29 -08:00
Michael Kolb
d694297171 am 3124e6f9: Merge "Remove debug log messages" into ics-mr1 
* commit '3124e6f9e96b730cdfbbf068f15c41b6d5c8a819':
  Remove debug log messages
 2011-12-05 16:13:49 -08:00
Michael Kolb
fcc6543339 Merge "Remove debug log messages" into ics-mr1 2011-12-05 16:12:35 -08:00
Xia Wang
196a6826fb am e63d67ef: Merge "Add extra 2 minute for wifi to shutdown" into ics-mr1 
* commit 'e63d67eff794ba2e4e5d2aa9e8854b37329f4429':
  Add extra 2 minute for wifi to shutdown
 2011-12-05 15:55:27 -08:00
Xia Wang
89b1dac8b1 Merge "Add extra 2 minute for wifi to shutdown" into ics-mr1 2011-12-05 15:52:34 -08:00
Svetoslav Ganov
3e458eabf4 am da926cf2: Merge "TalkBack does not announce properly the buttons of the PIN lock." into ics-mr1 
* commit 'da926cf284ff5f5ccf91dec088ff64d442cee25c':
  TalkBack does not announce properly the buttons of the PIN lock.
 2011-12-05 15:04:31 -08:00
Svetoslav Ganov
797fca9027 Merge "TalkBack does not announce properly the buttons of the PIN lock." into ics-mr1 2011-12-05 15:03:13 -08:00
Irfan Sheriff
2f04882c54 am 6b66e9e4: Switch to notifications for walled garden 
* commit '6b66e9e4c95b1c866ea63a0122fc199994fd7053':
  Switch to notifications for walled garden
 2011-12-05 14:22:03 -08:00
Peter Ng
46c14cdf18 am 74b496dd: Merge "Numberpicker section divider is now 2dp thick" into ics-mr1 
* commit '74b496dd8aab7e29bcba0c6502f773555c4ce29f':
  Numberpicker section divider is now 2dp thick
 2011-12-05 12:36:24 -08:00
Peter Ng
98c0f73407 Merge "Numberpicker section divider is now 2dp thick" into ics-mr1 2011-12-05 12:34:53 -08:00
Eric Fischer
4a71665321 am 845b3efc: Merge "Add missing locale date format files." into ics-mr1 
* commit '845b3efc9935e66b718d8e9a56435bf039f97633':
  Add missing locale date format files.
 2011-12-05 12:28:06 -08:00
Eric Fischer
b593c4b82e Merge "Add missing locale date format files." into ics-mr1 2011-12-05 12:25:58 -08:00
Andreas Huber
8e2bb37d9f 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
3174be1013 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
Dianne Hackborn
41342e8326 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
72516bcb52 Merge "Fix issue #5614559: Registering surface error in..." into ics-mr1 2011-12-05 10:40:59 -08:00
Michael Kolb
2d1cccda6c 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
d5de02094d Merge "set System UI visibility based on MediaController state" into ics-mr1 2011-12-05 09:24:25 -08:00
Jesse Hall
19a586f70a 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
7d9f44c2f0 Merge "SurfaceFlinger: fix layer removal race condition" into ics-mr1 2011-12-02 18:31:03 -08:00
Robert Greenwalt
b3e9629420 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
d76faf3963 Merge "Be careful sharing connections when dun is in play" into ics-mr1 2011-12-02 16:52:29 -08:00
Gilles Debunne
d934573021 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
557266f89a Merge "Handle animations in Views' rectangle clipping methods." into ics-mr1 2011-12-02 15:28:56 -08:00
John Reck
d8c16f2266 am 43bc6b09: Merge "Fix updateDoubleTapZoom logic" into ics-mr1 
* commit '43bc6b094edda6baa8123115a33afaf454525376':
  Fix updateDoubleTapZoom logic
 2011-12-02 14:49:19 -08:00
John Reck
4ca57ef165 Merge "Fix updateDoubleTapZoom logic" into ics-mr1 2011-12-02 14:47:04 -08:00
Mike Lockwood
f9d67a9081 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
511c45337f 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
128a09d9b1 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
1740eee1d0 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
5c33d1cadf 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
6c8163c640 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
f17b809ba0 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
75a3e54e66 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
00dbb097dc Merge "Disable GLES20Canvas on emu w/o native GL" into ics-mr1 2011-12-02 12:33:20 -08:00
Roman Nurik
ae065e1c2f 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
f7f7fff40b 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
9208d65973 Merge "Reduce file size for ADL presentation shareable." into ics-mr0 2011-12-02 11:57:03 -08:00
Amith Yamasani
168a075de8 am afd01086: Merge "Further volume improvements." into ics-mr1 
* commit 'afd01086795c7c1f6950a709180b2361625b8b6a':
  Further volume improvements.
 2011-12-02 11:24:03 -08:00
Amith Yamasani
66b39bd67c Merge "Further volume improvements." into ics-mr1 2011-12-02 11:22:32 -08:00
Gilles Debunne
5bc6298d6f 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
99b26e5406 Merge "(de)activating spell check taken into account immediately" into ics-mr1 2011-12-02 10:45:25 -08:00
Jesse Hall
2f4b68d21c 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