Fred Quintana
c1a4e5dc41
Make the AccountManagerService clear old grants when the package
...
that the grants refer to is no longer installed.
Bug: 3425856
Change-Id: I6ec057415c8f35be91c8434ff10e6cf5c1fc47bb
2011-02-28 16:36:14 -08:00
Jean-Baptiste Queru
5381b467d5
am fe9b24f4: Ignore a8d3f02a from honeycomb - already there
...
* commit 'fe9b24f4cd665573c2dc0ced444ecc4997ece1a1':
DO NOT MERGE
2011-02-10 15:04:20 -08:00
Huahui Wu
36d2823e57
Merge "b/3416864 Send the cert info from Native to Java side."
2011-02-10 15:00:23 -08:00
Jean-Baptiste Queru
fe9b24f4cd
Ignore a8d3f02a from honeycomb - already there
...
Change-Id: Ife79875dbf547c23771fc6b8f66464c76c0a4468
2011-02-10 14:49:12 -08:00
Gilles Debunne
cd2e264212
am aff2cfd1: resolved conflicts for merge of 8e28ab22 to honeycomb-plus-aosp
...
* commit 'aff2cfd14b3d37a22b2d6b1ba72b52c6a80a12b3':
Text selection is broken.
2011-02-10 14:48:02 -08:00
Gilles Debunne
aff2cfd14b
resolved conflicts for merge of 8e28ab22 to honeycomb-plus-aosp
...
Change-Id: Ic590c75a6d4475cc0a35f1af8687a4ee8846f20b
2011-02-10 14:43:35 -08:00
Huahui Wu
c56c3e262c
b/3416864 Send the cert info from Native to Java side.
...
Change-Id: Ib4f045f0dd58d85b329eae972c4a4a61ee95f078
2011-02-10 14:40:50 -08:00
Jesse Wilson
9ebc6b341b
Merge "Document that LruCache is threadsafe."
2011-02-10 14:33:20 -08:00
Vasu Nori
f37c2e2d13
Merge "bug:3443154 fix database tests after disabling sqlite wal"
2011-02-10 14:13:49 -08:00
Eric Laurent
04f7861cfa
Merge "Fix issue 3435692"
2011-02-10 14:01:27 -08:00
Steve Block
6dfef1b86d
Merge "Adds CookieManager methods to configure policy for cookies for file scheme URLs"
2011-02-10 13:59:09 -08:00
Wink Saville
72f0224f2f
am 48fe5c3a: am bdce3d2c: am 01a5eba8: am 6e25789f: Merge "Telephony: Fix cb sms implementation"
...
* commit '48fe5c3a86435a401fa88b43e15b84e29e660173':
Telephony: Fix cb sms implementation
2011-02-10 13:57:10 -08:00
Mathias Agopian
3013ce4f7c
am b624eea7: am d0f27f43: am ada1b6f2: Merge "fix [3421350] Killing a game that uses the accelerometer renders the device unable to sleep" into gingerbread
...
* commit 'b624eea70c18d616a1d0860eb30ae31ac5a33085':
fix [3421350] Killing a game that uses the accelerometer renders the device unable to sleep
2011-02-10 13:57:05 -08:00
Scott Main
6b5e69c7ef
am 0d66a2ec: am b605869c: am 07cefd3c: add 2.3.3 announcement to site home page
...
* commit '0d66a2ec428fe5ae746629b6c62750d1201e3f6f':
add 2.3.3 announcement to site home page
2011-02-10 13:57:02 -08:00
Jeff Hamilton
f6de2431ce
am 9e5ffb55: am c1cc9ba6: am 58c9d472: Merge "More documentation updates for NFC." into gingerbread
...
* commit '9e5ffb55e8eabf8fd9215cbc68538ed5d9efe2d4':
More documentation updates for NFC.
2011-02-10 13:56:56 -08:00
Dirk Dougherty
fa67d647d4
am 58dacceb: am 8d56f6de: am a3f53afd: Merge "Doc change: Add version notes for Android 2.3.3." into gingerbread
...
* commit '58dacceb789929c0d870649c5c0c2cab1045b898':
Doc change: Add version notes for Android 2.3.3.
2011-02-10 13:56:52 -08:00
Nick Pelly
e49448f715
am cc47600d: am 47dac545: am 39cf3a44: Document NFC permissions.
...
* commit 'cc47600d4d7850f2903d2d59cc7f44528d40c8e5':
Document NFC permissions.
2011-02-10 13:56:46 -08:00
Jeff Hamilton
40bbeeb409
am 510ced64: am 1ac35411: am 584afa8d: Merge "Improve the docs a bit for foreground dispatch." into gingerbread
...
* commit '510ced64f4316702cea07a55d1d473bdc07b2c86':
Improve the docs a bit for foreground dispatch.
2011-02-10 13:56:41 -08:00
Eric Fischer
da4efd3488
am bdf587e8: (-s ours) am c1c31433: (-s ours) am be4b39d2: Merge "Import revised translations. DO NOT MERGE" into gingerbread
...
* commit 'bdf587e8b9247fbf8e544f330cf0ec9efb1194db':
Import revised translations. DO NOT MERGE
2011-02-10 13:56:36 -08:00
Scott Main
e75d8a7c9e
am 51d94b26: am 129c7372: am 3c01a139: rename SIP doc title
...
* commit '51d94b268a63d0ffffce92aa7cb822ae99529d84':
rename SIP doc title
2011-02-10 13:56:29 -08:00
Wink Saville
48fe5c3a86
am bdce3d2c: am 01a5eba8: am 6e25789f: Merge "Telephony: Fix cb sms implementation"
...
* commit 'bdce3d2c3516612bfd3a9e5f259a892d1a595f19':
Telephony: Fix cb sms implementation
2011-02-10 13:53:10 -08:00
Mathias Agopian
b624eea70c
am d0f27f43: am ada1b6f2: Merge "fix [3421350] Killing a game that uses the accelerometer renders the device unable to sleep" into gingerbread
...
* commit 'd0f27f435eb8a2c7e5841da68760d1f023fcf919':
fix [3421350] Killing a game that uses the accelerometer renders the device unable to sleep
2011-02-10 13:53:01 -08:00
Scott Main
0d66a2ec42
am b605869c: am 07cefd3c: add 2.3.3 announcement to site home page
...
* commit 'b605869cd36c7498ca99cc00bad5d0dfbf237c43':
add 2.3.3 announcement to site home page
2011-02-10 13:52:57 -08:00
Jeff Hamilton
9e5ffb55e8
am c1cc9ba6: am 58c9d472: Merge "More documentation updates for NFC." into gingerbread
...
* commit 'c1cc9ba6d1e2b7f1e213d215e3edb97acea79901':
More documentation updates for NFC.
2011-02-10 13:52:48 -08:00
Dirk Dougherty
58dacceb78
am 8d56f6de: am a3f53afd: Merge "Doc change: Add version notes for Android 2.3.3." into gingerbread
...
* commit '8d56f6decf9efd29b286e02c549510d681b7573d':
Doc change: Add version notes for Android 2.3.3.
2011-02-10 13:52:40 -08:00
Nick Pelly
cc47600d4d
am 47dac545: am 39cf3a44: Document NFC permissions.
...
* commit '47dac545da6468e5b46e940917eb6711c02b8e84':
Document NFC permissions.
2011-02-10 13:52:34 -08:00
Jeff Hamilton
510ced64f4
am 1ac35411: am 584afa8d: Merge "Improve the docs a bit for foreground dispatch." into gingerbread
...
* commit '1ac35411f186dca346e8d9078a4fd2d570bb8a97':
Improve the docs a bit for foreground dispatch.
2011-02-10 13:52:23 -08:00
Scott Main
4eccd96f4a
am c06e7abe: resolved conflicts for merge of 42f18194 to honeycomb-plus-aosp
...
* commit 'c06e7abe6f37d1d8bc4f1c228964229d9f101d70':
docs: move the SIP guide into guide/network/
2011-02-10 13:51:30 -08:00
Eric Fischer
bdf587e8b9
am c1c31433: (-s ours) am be4b39d2: Merge "Import revised translations. DO NOT MERGE" into gingerbread
...
* commit 'c1c314334757e0ab3c244023aec1b24433b66b48':
Import revised translations. DO NOT MERGE
2011-02-10 13:50:51 -08:00
Scott Main
51d94b268a
am 129c7372: am 3c01a139: rename SIP doc title
...
* commit '129c73723f2241f762f485a9b5421bfae3cbbdcd':
rename SIP doc title
2011-02-10 13:50:44 -08:00
Jesse Wilson
34895b09db
Document that LruCache is threadsafe.
...
Change-Id: Iae1421b8c768000e56806f6cd74aef7c69a78973
http://b/3184897
2011-02-10 13:50:24 -08:00
Scott Main
c06e7abe6f
resolved conflicts for merge of 42f18194 to honeycomb-plus-aosp
...
Change-Id: I42c36e828f5b28d84f2062bfd4963711251696b7
2011-02-10 13:47:32 -08:00
Jesse Wilson
ed6d936eca
Merge "Remove SSLPerformanceTest and DatabaseSessionCache."
2011-02-10 13:44:56 -08:00
Eric Laurent
a25c5d88d1
Fix issue 3435692
...
The problem is that the AudioService is not notified of the death of
IAudioFlinger binder interface because no methods was called on AudioFlinger
from system_server since the device booted. Therefore, AudioSystem did not created any
IAudioFlinger interface in the system_server process.
The root cause was always present but more likely to happen on a tablet than on a phone
as for instance no beeps are played when volume is adjusted.
The fix consists in having AudioSystem explicitly call a method on AudioFlinger when a
callback is installed to make sure that an IAudioFlinger binder interface is created
regardless of any other activity in the client process.
Change-Id: I9df34a36825af0b25cd0246dd02edbd712263f41
2011-02-10 13:24:04 -08:00
Vasu Nori
e7dea4ec24
bug:3443154 fix database tests after disabling sqlite wal
...
sqlite wal is disabled in Change-Id: I283ad26ba7e1793772a372aa8e24df0cb96ce2ef
Change-Id: I2b370c65390a9293e4a82f650c9cee8023b861d7
2011-02-10 13:18:23 -08:00
Jesse Wilson
74815d332c
Remove SSLPerformanceTest and DatabaseSessionCache.
...
These aren't being run.
Change-Id: I9afc617a424c675578185ac66a4f6ac3af9afacf
2011-02-10 13:17:24 -08:00
Katie McCormick
360e40ef21
am ce7c05e8: resolved conflicts for merge of 690d31a6 to honeycomb-plus-aosp
...
* commit 'ce7c05e842d4e35ce180d398ecb969aad18f3460':
cherrypick Change-Id: I5b52c5d11e111a9dab2b08fd44a439ab4db04dd2 Doc change: Adding new docs for SIP API
2011-02-10 13:03:27 -08:00
Xavier Ducrohet
aa0d2124d5
Merge "LayoutLib: remove some exceptions."
2011-02-10 13:01:34 -08:00
Katie McCormick
ce7c05e842
resolved conflicts for merge of 690d31a6 to honeycomb-plus-aosp
...
Change-Id: I1308f0a5fda0646a90dcd60a78c15538c7364cbc
2011-02-10 12:38:07 -08:00
Andreas Huber
8cdc31f76a
Merge "Fix the build."
2011-02-10 12:35:06 -08:00
Andreas Huber
c2f9a26b1e
Fix the build.
...
Change-Id: I9b777ffb260eb0f3790ae0907e4a443d33fa3f2f
2011-02-10 12:34:25 -08:00
Marco Nelissen
4fd18e6310
Merge "Better genre support."
2011-02-10 12:23:11 -08:00
Steve Block
fb40a64d80
Merge "Increase DRT timeout while waiting for WebView to dump as text"
2011-02-10 12:13:27 -08:00
Marco Nelissen
cb613a04c1
Better genre support.
...
Expand the list of genres, and support genres that look like "(192)CustomGenre".
b/3349415
Change-Id: I617ea7dfeace708bbd0d9c00ff04de72fa2d383e
2011-02-10 12:09:16 -08:00
Adam Powell
96bad13901
Merge "Fix bug 3440372 - Spinner measurement issues with new rules"
2011-02-10 12:07:38 -08:00
Adam Powell
b70c727b2e
Fix bug 3440372 - Spinner measurement issues with new rules
...
Change-Id: I3633239dc42277eb6447cf7f0907f35f4b45e873
2011-02-10 12:04:59 -08:00
Andreas Huber
8e6f60d9bb
Merge "Change timestamp handling in RTSP, remove unused, experimental, gtalk support"
2011-02-10 11:55:22 -08:00
Andreas Huber
b2934b16ea
Change timestamp handling in RTSP, remove unused, experimental, gtalk support
...
related-to-bug: 3216447
NTP timestamp handling is now done at a higher layer than before.
Change-Id: I9fb23f1335110ec59e534f9aa0fe6f6a6406dd52
2011-02-10 11:53:54 -08:00
John Reck
c943cd123e
Merge "Fix spacing issue"
2011-02-10 11:53:10 -08:00
John Reck
e4fee50558
Fix spacing issue
...
Bug: 3432069
Change-Id: If58d19cacb99f3ab7fdc4d8fdbb86f0853010ed1
2011-02-10 11:33:35 -08:00