Jason parks
bef49808c7
Merge "Implement teardown script." into gingerbread
2011-04-01 13:11:06 -07:00
James Dong
2688dddfd2
Merge "When read() from AudioRecord returns 0 or negative value, report an error to application. DO NOT MERGE." into gingerbread
2011-03-31 11:20:40 -07:00
Eric Laurent
ce75529174
Merge "Issue 4157048: mic gain for VoIP/SIP calls." into gingerbread
2011-03-30 14:55:49 -07:00
Mike Lockwood
6de2e32fd3
Merge "DO NOT MERGE: UsbService: Make USB disconnect handling for accessory mode more robust" into gingerbread
2011-03-30 14:15:51 -07:00
Trevor Johns
e4e971ee13
Merge "Fixing line in Market IAB docs that explains how to bind to the MarketService." into gingerbread
2011-03-30 13:50:40 -07:00
Simon Wilson
ae9739aec3
Merge "DO NOT MERGE Disable WiMAX when "Data Enabled" is off" into gingerbread
2011-03-30 13:26:45 -07:00
Eric Fischer
8ee2f9df92
Merge "Import revised translations. DO NOT MERGE" into gingerbread
2011-03-30 10:41:05 -07:00
Jason parks
00607ddaee
Merge "Send out a broadcast that the system is being factory reset." into gingerbread
2011-03-30 08:17:53 -07:00
Jean-Baptiste Queru
825370ebef
No-op - reconcile with open-source gingerbread
...
Change-Id: I64beb8dfb6f175eb9a160f1145dad3dc323fc98e
2011-03-29 14:05:53 -07:00
Michael I. Gold
894c1459c1
egl: fixes for object refcounts
...
eglMakeCurrent() would only deref the previous surfaces if the old and
new contexts were the same. eglTerminate() should not touch TLS.
eglReleaseThread() needs to unbind the current context.
Change-Id: I7f4c090a287ee1e29e4708ae10679fb9d7d8c8c5
Related-Bug: 2964479
2011-03-29 13:43:54 -07:00
Robert Greenwalt
f9a75b96bd
Merge "Fix Default route after secondary net use." into gingerbread
2011-03-26 08:58:01 -07:00
Jeff Hamilton
fbf4a75c57
Merge "Make STOP_APP_SWITCHES signatureOrSystem." into gingerbread
2011-03-25 14:53:14 -07:00
Irfan Sheriff
fce4eab91a
Merge "DO NOT MERGE Pick upstream intf with valid IP conf" into gingerbread
2011-03-25 11:01:02 -07:00
Robert Greenwalt
9028577960
Merge "Fix some alt-network issues." into gingerbread
2011-03-25 09:35:53 -07:00
Nick Pelly
54b76288d4
Merge "NfcAdapterExtras: reset singleton state if initialization fails." into gingerbread
2011-03-22 09:52:55 -07:00
Simon Wilson
3614b4772e
Merge "DO NOT MERGE Change WiMAX indicator display" into gingerbread
2011-03-21 16:58:41 -07:00
Fred Quintana
3e4bb01174
Merge "remove the code that clears the passwords when the sim is replaced with a different one." into gingerbread
2011-03-21 11:04:23 -07:00
Eric Fischer
d2cd24d8ce
Merge "Import revised translations. DO NOT MERGE" into gingerbread
2011-03-18 15:22:05 -07:00
Valentin Kravtsov
16f5cc4c58
Merge "Fixing a race condition in RecognitionService" into gingerbread
2011-03-18 08:49:51 -07:00
Xia Wang
0d2b3fe91d
Merge "Port wi-fi stress test into GB DO NOT MERGE" into gingerbread
2011-03-17 15:06:40 -07:00
Simon Wilson
2d0c7bfc6a
Merge "DO NOT MERGE Add images to ERI icon list" into gingerbread
2011-03-16 19:51:07 -07:00
Dianne Hackborn
9db5a3473f
Merge "Improve error reporting for issue #3183612 " into gingerbread
2011-03-15 14:40:56 -07:00
Mike Lockwood
79ae55e051
Merge "DO NOT MERGE: Backport more USB accessory changes from honeycomb" into gingerbread
2011-03-15 14:04:54 -07:00
Xavier Ducrohet
124eb84c5e
Merge "Merge 6f2fb570 from honeycomb. do not merge." into gingerbread
2011-03-15 11:29:16 -07:00
Xavier Ducrohet
1d0284b613
Merge "Merge c12b4093 from honeycomb. do not merge." into gingerbread
2011-03-15 11:29:07 -07:00
Dianne Hackborn
bebc96ba62
Merge "Add some debug code to try to track down issue 3183612" into gingerbread
2011-03-15 10:29:04 -07:00
Mike Lockwood
d24c514601
Merge "DO NOT MERGE: backport recent USB accessory changes from honeycomb" into gingerbread
2011-03-14 13:17:24 -07:00
Simon Wilson
82333c550e
Merge "DO NOT MERGE Support WiMAX Settings & ticker message" into gingerbread
2011-03-14 11:40:17 -07:00
Daniel Sandler
d0dca10d5d
Merge "Workaround unknown ERI indices." into gingerbread
2011-03-14 11:37:12 -07:00
Gilles Debunne
d567127f0a
Merge "Double tap on a word no longer opens context menu. DO NOT MERGE" into gingerbread
2011-03-14 11:30:17 -07:00
James Dong
f3f7d3504e
Merge "MP3Extractor and MP3 decoder fixes - DO NOT MERGE" into gingerbread
2011-03-11 13:38:02 -08:00
Ying Wang
71d6c882b4
Merge "Dist com.android.nfc_extras.jar." into gingerbread
2011-03-11 10:17:49 -08:00
Robert Greenwalt
f0e9794de9
Merge "DO NOT MERGE Backport of I1f55df8a from master." into gingerbread
2011-03-11 10:14:28 -08:00
Robert Greenwalt
de528f2bd8
Merge "Don't accept a user-defined dun-capable connection" into gingerbread
2011-03-10 10:41:36 -08:00
Mathias Agopian
c1315657bd
Merge "revert the surface purgatory list and dependent changes." into gingerbread
2011-03-09 17:07:27 -08:00
Mathias Agopian
f7662afb76
revert the surface purgatory list and dependent changes.
...
6d0f6cb Revert "Fix [3513017] in lockscreen but showing empty launcher (live wallpaper) only"
6154412 Revert "partially fix [3306150] HTML5 video with H/W acceleration blackout (DO NOT MERGE)"
37c2a37 fix [3408713] Dialog window invisible sometimes
It looks like there is a surface leak, it's unclear where it is.
Without those reverts, this would cause a leak of the associated buffers
which is far more problematic. this change might hide the surface leak.
Bug: 4078032
Change-Id: Iedcda3ffcdd2f69d41047b5c3134c1e867ff90d7
2011-03-09 17:00:41 -08:00
Mathias Agopian
e379402df1
Merge "fix [3452750] Issue 14634: SensorManager.getRotationMatrixFromVector gets NaN-Values [external] [DO NOT MERGE]" into gingerbread
2011-03-09 16:54:21 -08:00
Mathias Agopian
9e62542dcb
Merge "fix [4026375] SensorManager quaternion functions can call sqrt with a negative number [DO NOT MERGE]" into gingerbread
2011-03-09 16:54:14 -08:00
Mathias Agopian
f4e1ef0794
Merge "Fix [3513017] in lockscreen but showing empty launcher (live wallpaper) only" into gingerbread
2011-03-07 18:00:20 -08:00
Mathias Agopian
ee65ac8a71
Fix [3513017] in lockscreen but showing empty launcher (live wallpaper) only
...
37c2a37 fix [3408713] Dialog window invisible sometimes
d35c666 fix [3385504] Surface flinger hang when adding dim surface
1723b04 fix [3389263] OMX.Nvidia.h264.decode fails to shutdown
1b0114f fix a surface leak in SurfaceFlinger
Bug: 3513017
Change-Id: Ia13ed8c9cdcb1f484e177cdcaff687e7c88a10c3
2011-03-07 16:56:16 -08:00
Simon Wilson
8cb531d3c9
Merge "mms: mms wap push length check before pdu processing." into gingerbread
2011-03-07 15:39:19 -08:00
Lorenzo Colitti
be1b18fcae
Merge "Add a protocol property to the APNs and use it." into gingerbread
2011-03-03 17:04:07 -08:00
Lorenzo Colitti
3187c38719
Merge "Make setupDataCall take a protocol parameter." into gingerbread
2011-03-03 17:03:58 -08:00
Jeff Brown
7a1626f037
Merge "Only set KeyEvent long press flag when repeat count equals 1." into gingerbread
2011-03-03 14:42:14 -08:00
Jeff Brown
ec7fb80775
Only set KeyEvent long press flag when repeat count equals 1.
...
This fixes a Gingerbread regression.
Bug: 3507021
Change-Id: Ia6030665b6a406332adc0ee0d8ee3cb735338c8e
2011-03-02 20:49:06 -08:00
Mike Lockwood
129c27d64d
Merge "DO NOT MERGE: UsbService: Make sure the USB accessory function is disabled when we disconnect" into gingerbread
2011-03-02 18:27:33 -08:00
Simon Wilson
4abb1f078d
Merge "Attempt to reduce problems from issue #3183612 " into gingerbread
2011-03-02 18:03:52 -08:00
Costin Manolache
a9869cf37b
Merge "DO NOT MERGE Backport (with modifications ) some changes from Honeycomb, that would allow authenticators to control caching and permissions." into gingerbread
2011-03-01 12:25:21 -08:00
Mike Lockwood
1630f54d5b
Merge "UsbService: Remove stack-trace message during boot. DO NOT MERGE" into gingerbread
2011-02-28 13:12:11 -08:00
Mike Lockwood
93314ad737
Merge "DO NOT MERGE: Clean up USB notifications:" into gingerbread
2011-02-28 13:12:03 -08:00
