Robert Greenwalt
af75fdb165
resolved conflicts for merge of 41394a36 to honeycomb-plus-aosp
...
Change-Id: Ic839eb7bd8081b94802dbbf9140b9d1fa0cf7df3
2011-07-27 09:27:00 -07:00
Robert Greenwalt
41394a3610
Merge "Use dns proxy a bit." into honeycomb-LTE
2011-07-26 13:21:09 -07:00
John Michelau
fada80df08
am ac74551b: Disable name lookups for dumpstate calls to "iptables -L"
...
* commit 'ac74551bb42eb2d6775d994357481113375574e7':
Disable name lookups for dumpstate calls to "iptables -L"
2011-07-25 22:26:38 -07:00
John Michelau
ac74551bb4
Disable name lookups for dumpstate calls to "iptables -L"
...
The name lookups are not helpful enough to warrant the large delays
they can cause.
Change-Id: I8710e76b15b7cf060b7f4f89128ea3249fcdbd0d
2011-07-25 21:53:15 -07:00
Robert Greenwalt
572b7048a6
Use dns proxy a bit.
...
Sets the current default interface and sets the dns per interface.
port of changes 23041 and 22098 from opensource.
bug:5060618
Change-Id: I80e7ef88727eeb8ff2b48059f69b270e5a6b5c16
2011-07-25 17:00:13 -07:00
Wink Saville
bfce70342f
am 32d106e1: Filter out addresses that are 0.
...
* commit '32d106e154d0388ac13774fad3c58ff60ba9ae8f':
Filter out addresses that are 0.
2011-07-25 15:31:44 -07:00
Wink Saville
32d106e154
Filter out addresses that are 0.
...
If the address is "any" address, i.e. an address which is all zeros
for both IPv4 and IPv6 ignore it.
Bug: 5073048
Change-Id: I8b9f64103aaffd001114a672375ff5f99616c327
2011-07-25 15:26:56 -07:00
Robert Greenwalt
8ba16551bc
Merge "Fix build." into honeycomb-plus-aosp
2011-07-25 14:05:23 -07:00
Robert Greenwalt
37e433fd1c
Fix build.
...
Add NetworkUtils function missed in manual merge.
Change-Id: Ifce8f2988bb581ddc9b971b8af07a32f46c91e14
2011-07-25 14:00:42 -07:00
Dianne Hackborn
1b20abd30c
am 20bf46af: am b0878223: am 6800a801: Merge "frameworks/base: Cap the number of toasts that a package can post."
...
* commit '20bf46af14130314ae1aeb1e5482c38556c8f0f8':
frameworks/base: Cap the number of toasts that a package can post.
2011-07-25 12:21:32 -07:00
Dianne Hackborn
6d21aee882
am 9ce1ecdf: am 1a2fcea1: am 2f4698fd: Merge "frameworks/base: unlink death notifications of Vibrate requests"
...
* commit '9ce1ecdfde98c7b5b5ec346b883df0a50d9722e1':
frameworks/base: unlink death notifications of Vibrate requests
2011-07-25 12:21:29 -07:00
Xavier Ducrohet
ed07215e48
am 55775e5f: am e70b2b8f: am 9bcf26ea: Merge "Layoutlib_create flag -p: don\'t change all accesses to public."
...
* commit '55775e5f34af8d7c22ab3212c253b3a7d34a6f8a':
Layoutlib_create flag -p: don't change all accesses to public.
2011-07-25 12:21:17 -07:00
Kenny Root
64ed105957
am e612c881: am 4f3a8db6: am 3cf03987: Merge "Continue idmap generation even if name lookup fails."
...
* commit 'e612c881ecf74770098aa9c07d4f0611ac982038':
Continue idmap generation even if name lookup fails.
2011-07-25 12:21:06 -07:00
Robert Greenwalt
a7f68230be
resolved conflicts for merge of 26ecc31f to honeycomb-plus-aosp
...
Change-Id: I23f42e247884f0c9d5ae4d3466213592dd3433d9
2011-07-25 12:08:19 -07:00
Wink Saville
051660d4d6
am deb62be2: Merge "Configure RAT dependent retry pattern in GSM DCT." into honeycomb-LTE
...
* commit 'deb62be2e87b19e9bbbc668f8d9327b12dba4a3b':
Configure RAT dependent retry pattern in GSM DCT.
2011-07-24 09:13:26 -07:00
Kazuhiro Ondo
9820a9d299
am 4281817f: Allow suggestedRetryTime to indicate no retry is needed.
...
* commit '4281817f6b624cb51926eb24fa78c68cd9431dce':
Allow suggestedRetryTime to indicate no retry is needed.
2011-07-24 09:11:42 -07:00
Wink Saville
deb62be2e8
Merge "Configure RAT dependent retry pattern in GSM DCT." into honeycomb-LTE
2011-07-24 09:11:28 -07:00
Kazuhiro Ondo
4281817f6b
Allow suggestedRetryTime to indicate no retry is needed.
...
If suggestedRetryTime is 0x7fffffff then no retry is needed
and the framework should not initiate a retry.
Bug: 4949208
Change-Id: I3756ef6a3e93beec4ee95863cbc111b9952e5e06
2011-07-24 08:10:53 -07:00
Kazuhiro Ondo
789df167fa
Configure RAT dependent retry pattern in GSM DCT.
...
In case GSM DCT is used with EHRPD, retry pattern should follow
the ones for CDMA.
Bug: 5058426
Change-Id: Id9badc9ac14fb20ac62c1746061f056fa2f9ed1b
2011-07-23 13:48:12 -07:00
Svetoslav Ganov
3e930dba58
am d1b4c10f: Merge "DO NOT MERGE AccessibilityInjectorTest did not restore the default key binsings." into honeycomb-LTE
...
* commit 'd1b4c10fedc04384f40ba7fc30115a1380ce014f':
DO NOT MERGE AccessibilityInjectorTest did not restore the default key binsings.
2011-07-22 17:07:28 -07:00
Svetoslav Ganov
d1b4c10fed
Merge "DO NOT MERGE AccessibilityInjectorTest did not restore the default key binsings." into honeycomb-LTE
2011-07-22 17:05:26 -07:00
Robert Greenwalt
1993391694
am ad55d351: Add better routes for secondary DNS
...
* commit 'ad55d35114237071133eb28ded93a014185d4e35':
Add better routes for secondary DNS
2011-07-22 13:15:56 -07:00
Robert Greenwalt
ad55d35114
Add better routes for secondary DNS
...
We'd been doing no-gateway hostroutes for dns servers on secondary nets, but on
some devices (multi-homed stingray) this is a problem. Add gateway-ed hostroutes
instead so the BP can do it's nonstandard "magical" demultiplexing.
bug:5011392
Change-Id: Ia48f69c8ddf2a37cfb8f014f078f96bf601d2ddb
2011-07-22 12:52:21 -07:00
Dianne Hackborn
20bf46af14
am b0878223: am 6800a801: Merge "frameworks/base: Cap the number of toasts that a package can post."
...
* commit 'b0878223db87700cdc988a6d9197ca4e3c4772db':
frameworks/base: Cap the number of toasts that a package can post.
2011-07-21 22:37:13 -07:00
Dianne Hackborn
b0878223db
am 6800a801: Merge "frameworks/base: Cap the number of toasts that a package can post."
...
* commit '6800a80199477c90fc64af7211a177de06478a02':
frameworks/base: Cap the number of toasts that a package can post.
2011-07-21 22:35:32 -07:00
Dianne Hackborn
9ce1ecdfde
am 1a2fcea1: am 2f4698fd: Merge "frameworks/base: unlink death notifications of Vibrate requests"
...
* commit '1a2fcea1a28074f15126471daa5a8650cb5e2ecc':
frameworks/base: unlink death notifications of Vibrate requests
2011-07-21 22:26:20 -07:00
Dianne Hackborn
1a2fcea1a2
am 2f4698fd: Merge "frameworks/base: unlink death notifications of Vibrate requests"
...
* commit '2f4698fda46a3d2a6e78019588d77bae1cfa7193':
frameworks/base: unlink death notifications of Vibrate requests
2011-07-21 22:23:46 -07:00
Dianne Hackborn
6800a80199
Merge "frameworks/base: Cap the number of toasts that a package can post."
2011-07-21 22:21:19 -07:00
Dianne Hackborn
2f4698fda4
Merge "frameworks/base: unlink death notifications of Vibrate requests"
2011-07-21 22:18:47 -07:00
Svetoslav Ganov
610d1f1fae
DO NOT MERGE AccessibilityInjectorTest did not restore the default key binsings.
...
CHERRY PICK FROM MASTER
1. AccessibilityInjectorTest changes the key bindings and when done
restores the defatult ones. The restoreation was not working.
bug:4905620
Change-Id: I812bad0b748637ded0ce69ace12517511f62f726
2011-07-21 18:53:47 -07:00
Kazuhiro Ondo
b7ad442c90
am 1c82f56f: Display CSIM SPN only if camping SID/NID matches CSIM CDMAHOME
...
* commit '1c82f56f2453a8a7c83090017ab2427a74829b9a':
Display CSIM SPN only if camping SID/NID matches CSIM CDMAHOME
2011-07-21 18:15:26 -07:00
Kazuhiro Ondo
1c82f56f24
Display CSIM SPN only if camping SID/NID matches CSIM CDMAHOME
...
Fix to resolve conflicting ERI and CSIM SPN. CSIM SPN should be
only used when camping SID/NID is listed in CDMAHOME record.
Bug: 5057486
Change-Id: I6c5961bb53cc6257237fa5a93a0acd067b12d009
2011-07-21 17:04:58 -07:00
Xavier Ducrohet
55775e5f34
am e70b2b8f: am 9bcf26ea: Merge "Layoutlib_create flag -p: don\'t change all accesses to public."
...
* commit 'e70b2b8fe0c265171f3a367a66c99b36c62567c7':
Layoutlib_create flag -p: don't change all accesses to public.
2011-07-21 16:25:50 -07:00
Xavier Ducrohet
e70b2b8fe0
am 9bcf26ea: Merge "Layoutlib_create flag -p: don\'t change all accesses to public."
...
* commit '9bcf26ea7aa108ce4bf4e973b4774d3e60eebafe':
Layoutlib_create flag -p: don't change all accesses to public.
2011-07-21 16:23:18 -07:00
Xavier Ducrohet
9bcf26ea7a
Merge "Layoutlib_create flag -p: don't change all accesses to public."
2011-07-21 16:17:03 -07:00
Kenny Root
e612c881ec
am 4f3a8db6: am 3cf03987: Merge "Continue idmap generation even if name lookup fails."
...
* commit '4f3a8db64d75cd3e88213d3b105dc50fc5bd6262':
Continue idmap generation even if name lookup fails.
2011-07-21 13:11:01 -07:00
Kenny Root
4f3a8db64d
am 3cf03987: Merge "Continue idmap generation even if name lookup fails."
...
* commit '3cf039876177b5b314b635bb12a1dae1b42f4605':
Continue idmap generation even if name lookup fails.
2011-07-21 13:09:05 -07:00
Kenny Root
3cf0398761
Merge "Continue idmap generation even if name lookup fails."
2011-07-21 13:05:03 -07:00
Robert Greenwalt
26ecc31f36
am 594745ab: am b9f87f19: Merge "First pass tying into per-interface DNS cache"
...
* commit '594745abefe53abe7f577bbb3cc176d52ee00ba1':
First pass tying into per-interface DNS cache
2011-07-21 11:29:05 -07:00
Robert Greenwalt
594745abef
am b9f87f19: Merge "First pass tying into per-interface DNS cache"
...
* commit 'b9f87f1970217d24213c8e3dd7755a0e4d82f8eb':
First pass tying into per-interface DNS cache
2011-07-21 11:28:01 -07:00
Robert Greenwalt
b9f87f1970
Merge "First pass tying into per-interface DNS cache"
2011-07-21 11:16:12 -07:00
Xavier Ducrohet
b3ab070edb
am 3a2d1c23: am ddb8e3b2: am 9bac0a9f: Merge "Fix to compile for windows"
...
* commit '3a2d1c2351c0b4eeb4dc4d91d1c334b9f8ba00ed':
Fix to compile for windows
2011-07-20 18:55:21 -07:00
Xavier Ducrohet
3a2d1c2351
am ddb8e3b2: am 9bac0a9f: Merge "Fix to compile for windows"
...
* commit 'ddb8e3b24b2fe3e4371ca8c1239748f5c71910f6':
Fix to compile for windows
2011-07-20 18:53:08 -07:00
Xavier Ducrohet
ddb8e3b24b
am 9bac0a9f: Merge "Fix to compile for windows"
...
* commit '9bac0a9f93976ff341fc9c46b3a85be767119a88':
Fix to compile for windows
2011-07-20 18:49:46 -07:00
Xavier Ducrohet
9bac0a9f93
Merge "Fix to compile for windows"
2011-07-20 18:35:35 -07:00
Josiah Gaskin
9102165fd8
Fix to compile for windows
...
This change includes a workaround for dirent.h on windows not
including d_type.
Change-Id: Ieaa3f298d2e6b32f2d8367384a1d02a2f5d06cca
2011-07-20 18:22:26 -07:00
Xavier Ducrohet
84be06e4ce
resolved conflicts for merge of ea9e6d24 to honeycomb-plus-aosp
...
Change-Id: I8e047147a4d2c899b6654c03a5f32b04d929e602
2011-07-20 17:45:11 -07:00
Xavier Ducrohet
a125c937de
resolved conflicts for merge of 2c311be7 to honeycomb-plus-aosp
...
Change-Id: I806c7b4ae95f66df621587e52497dd8739a115fe
2011-07-20 16:31:25 -07:00
Xavier Ducrohet
ea9e6d24a4
am b582af31: am 0bc12a0b: Merge "Added Caching for PreProcessed PNGs"
...
* commit 'b582af31c74a58922120fdb747c1a3b867d95e90':
Added Caching for PreProcessed PNGs
2011-07-20 16:02:33 -07:00
Xavier Ducrohet
b582af31c7
am 0bc12a0b: Merge "Added Caching for PreProcessed PNGs"
...
* commit '0bc12a0b13719976aff95a801d88e48c64510d11':
Added Caching for PreProcessed PNGs
2011-07-20 16:00:44 -07:00