OSDN Git Service
Jean-Baptiste Queru [Wed, 3 Aug 2011 00:22:43 +0000 (17:22 -0700)]
am
3a5e36f9: (-s ours) am
98c531dc: am
9b0c6bee: Merge "Fix a compiling error when trying to use setBufferCount"
* commit '
3a5e36f96bf61a8fb71c49cf93bd97c5e1d6abb4':
Fix a compiling error when trying to use setBufferCount
Jean-Baptiste Queru [Wed, 3 Aug 2011 00:19:05 +0000 (17:19 -0700)]
am
98c531dc: am
9b0c6bee: Merge "Fix a compiling error when trying to use setBufferCount"
* commit '
98c531dca9e52af280ca002658bbe38775b3f6ae':
Fix a compiling error when trying to use setBufferCount
Jean-Baptiste Queru [Wed, 3 Aug 2011 00:15:24 +0000 (17:15 -0700)]
am
9b0c6bee: Merge "Fix a compiling error when trying to use setBufferCount"
* commit '
9b0c6beed2cd5463655712ad80ed160c08611ff8':
Fix a compiling error when trying to use setBufferCount
Jean-Baptiste Queru [Wed, 3 Aug 2011 00:02:48 +0000 (17:02 -0700)]
Merge "Fix a compiling error when trying to use setBufferCount"
Teng-Hui Zhu [Tue, 2 Aug 2011 23:26:41 +0000 (16:26 -0700)]
Fix a compiling error when trying to use setBufferCount
Change-Id: I1aefaf7ec111340a584e0beeeea60b845e16bb1f
Conley Owens [Tue, 2 Aug 2011 20:30:51 +0000 (13:30 -0700)]
am
f8c1f129: am
e1d27154: am
f87743e7: Merge "Prevent NullPointerException cases while using SipService."
* commit '
f8c1f1298ac3ede518c8d29eeb6719746c6afaf0':
Prevent NullPointerException cases while using SipService.
Conley Owens [Tue, 2 Aug 2011 20:24:00 +0000 (13:24 -0700)]
am
e1d27154: am
f87743e7: Merge "Prevent NullPointerException cases while using SipService."
* commit '
e1d271546767a8e2213aabba92506af9e97020b4':
Prevent NullPointerException cases while using SipService.
Conley Owens [Tue, 2 Aug 2011 20:21:12 +0000 (13:21 -0700)]
am
f87743e7: Merge "Prevent NullPointerException cases while using SipService."
* commit '
f87743e7bdfd10b9a1719036a6320a32df078879':
Prevent NullPointerException cases while using SipService.
Conley Owens [Tue, 2 Aug 2011 20:08:14 +0000 (13:08 -0700)]
Merge "Prevent NullPointerException cases while using SipService."
Jean-Baptiste Queru [Mon, 1 Aug 2011 21:10:39 +0000 (14:10 -0700)]
am
5bb3129c: (-s ours) am
a2616220: am
5e57c2cf: Merge "Stagefright: Return error if codec takes too long to return a buffer."
* commit '
5bb3129c7eabce34d7c1469826e1795d4b225bb3':
Stagefright: Return error if codec takes too long to return a buffer.
Jean-Baptiste Queru [Mon, 1 Aug 2011 20:59:02 +0000 (13:59 -0700)]
am
a2616220: am
5e57c2cf: Merge "Stagefright: Return error if codec takes too long to return a buffer."
* commit '
a2616220d24b994e79fcbf33f7ce8a311fa9e8ac':
Stagefright: Return error if codec takes too long to return a buffer.
Jean-Baptiste Queru [Mon, 1 Aug 2011 20:55:45 +0000 (13:55 -0700)]
am
5e57c2cf: Merge "Stagefright: Return error if codec takes too long to return a buffer."
* commit '
5e57c2cf83ef62e9887592b46a4c3352662fb988':
Stagefright: Return error if codec takes too long to return a buffer.
Jean-Baptiste Queru [Mon, 1 Aug 2011 20:43:07 +0000 (13:43 -0700)]
Merge "Stagefright: Return error if codec takes too long to return a buffer."
Eric Fischer [Mon, 1 Aug 2011 18:19:59 +0000 (11:19 -0700)]
am
f01b3cfa: (-s ours) am
c0e5967f: Merge "Import revised translations. DO NOT MERGE" into gingerbread
* commit '
f01b3cfa9ac2869e3762a90917569186039a9665':
Import revised translations. DO NOT MERGE
Eric Fischer [Mon, 1 Aug 2011 18:17:17 +0000 (11:17 -0700)]
am
c0e5967f: Merge "Import revised translations. DO NOT MERGE" into gingerbread
* commit '
c0e5967fb9cb5328623a3be8f0c270cbbfe76ed7':
Import revised translations. DO NOT MERGE
Eric Fischer [Mon, 1 Aug 2011 18:15:58 +0000 (11:15 -0700)]
Merge "Import revised translations. DO NOT MERGE" into gingerbread
Masahiko Endo [Thu, 28 Jul 2011 12:51:43 +0000 (21:51 +0900)]
Prevent NullPointerException cases while using SipService.
Some SipService methods may return null, in such cases like no Wi-Fi
connection. Added minimum check to prevent NullPointerExceptions.
Change-Id: Ia7fae57ee893f2564cbfdedb6dc614938ab60ff7
Signed-off-by: Masahiko Endo <masahiko.endo@gmail.com>
Derek Sollenberger [Fri, 29 Jul 2011 18:24:37 +0000 (11:24 -0700)]
Merge "resolved conflicts for merge of
b7f09f28 to honeycomb-plus-aosp" into honeycomb-plus-aosp
Derek Sollenberger [Fri, 29 Jul 2011 18:16:18 +0000 (14:16 -0400)]
resolved conflicts for merge of
b7f09f28 to honeycomb-plus-aosp
Change-Id: Iebde13c41a2adf4e693d87e808cb0659f913e4e6
Robert Greenwalt [Fri, 29 Jul 2011 17:53:16 +0000 (10:53 -0700)]
am
1a230885: Merge "Fix NPE when going from proxy to no proxy." into honeycomb-LTE
* commit '
1a230885b356256e91b3bf006ec72213ba6f8f76':
Fix NPE when going from proxy to no proxy.
Robert Greenwalt [Fri, 29 Jul 2011 17:51:32 +0000 (10:51 -0700)]
Merge "Fix NPE when going from proxy to no proxy." into honeycomb-LTE
Robert Greenwalt [Fri, 29 Jul 2011 17:03:37 +0000 (10:03 -0700)]
Fix NPE when going from proxy to no proxy.
bug:
5081431
Change-Id: I68a8cca94e4612bd9ee2faf1123e0b63dc25b833
Derek Sollenberger [Fri, 29 Jul 2011 16:53:09 +0000 (09:53 -0700)]
am
b7ed8471: am
01caec8c: Merge "Adding an optional param to the SurfaceTexture constructor."
* commit '
b7ed8471f1b96aff901149cf9ac29e4b32672f93':
Adding an optional param to the SurfaceTexture constructor.
Derek Sollenberger [Fri, 29 Jul 2011 16:50:11 +0000 (09:50 -0700)]
am
01caec8c: Merge "Adding an optional param to the SurfaceTexture constructor."
* commit '
01caec8c4165a6cce2f276f8016b9eadab966944':
Adding an optional param to the SurfaceTexture constructor.
Derek Sollenberger [Fri, 29 Jul 2011 16:43:13 +0000 (09:43 -0700)]
Merge "Adding an optional param to the SurfaceTexture constructor."
Robert Greenwalt [Fri, 29 Jul 2011 16:20:51 +0000 (09:20 -0700)]
am
0d8acea9: Make copy-constructor make deep copy.
* commit '
0d8acea9bb452d1fdbb3d811041f7bdb1b0ef8a3':
Make copy-constructor make deep copy.
Derek Sollenberger [Fri, 29 Jul 2011 15:04:51 +0000 (11:04 -0400)]
Adding an optional param to the SurfaceTexture constructor.
Change-Id: I0fdbccf483a16af8039b85c0562f19a34ebce536
Robert Greenwalt [Fri, 29 Jul 2011 00:21:25 +0000 (17:21 -0700)]
Make copy-constructor make deep copy.
Used to grab immutables but now will copy the data so the result
is mutable and we don't get crashes.
bug:
5051667
Change-Id: I0878bf8c58069055f528121541d1911f404cbe49
Mike Lockwood [Thu, 28 Jul 2011 21:04:13 +0000 (14:04 -0700)]
am
5f7203eb: am
5a27a754: am
bd1dee94: Merge "gps: Adding ip address for AGps"
* commit '
5f7203eb258503bc5d2ba29176bdf483a68a93b8':
gps: Adding ip address for AGps
Mike Lockwood [Thu, 28 Jul 2011 21:02:14 +0000 (14:02 -0700)]
am
5a27a754: am
bd1dee94: Merge "gps: Adding ip address for AGps"
* commit '
5a27a7543edbd09a56e36d04adb4cfab922e6346':
gps: Adding ip address for AGps
Mike Lockwood [Thu, 28 Jul 2011 21:00:27 +0000 (14:00 -0700)]
am
bd1dee94: Merge "gps: Adding ip address for AGps"
* commit '
bd1dee94dfe2e1d7564cae3c8c6be53cc4e66998':
gps: Adding ip address for AGps
Mike Lockwood [Thu, 28 Jul 2011 20:52:55 +0000 (13:52 -0700)]
Merge "gps: Adding ip address for AGps"
Stephen Li [Wed, 2 Mar 2011 04:56:00 +0000 (20:56 -0800)]
gps: Adding ip address for AGps
Change-Id: Ic590187d159853de2f1bd2912e159f0a00d8fb10
Mike Lockwood [Thu, 28 Jul 2011 20:27:27 +0000 (13:27 -0700)]
am
bf676d46: am
7083ed44: am
0ff79e88: Merge "GPS: Changes to enable on-demand data call flow for CDMA connections"
* commit '
bf676d460d1d1fc8923982006c38d0f6785daea8':
GPS: Changes to enable on-demand data call flow for CDMA connections
Mike Lockwood [Thu, 28 Jul 2011 20:25:34 +0000 (13:25 -0700)]
am
7083ed44: am
0ff79e88: Merge "GPS: Changes to enable on-demand data call flow for CDMA connections"
* commit '
7083ed44ee72d4885d01c683eb745dc4bdfb74d8':
GPS: Changes to enable on-demand data call flow for CDMA connections
Mike Lockwood [Thu, 28 Jul 2011 20:23:01 +0000 (13:23 -0700)]
am
0ff79e88: Merge "GPS: Changes to enable on-demand data call flow for CDMA connections"
* commit '
0ff79e88e2d90f80d0346e0485abe773ca85c44d':
GPS: Changes to enable on-demand data call flow for CDMA connections
Mike Lockwood [Thu, 28 Jul 2011 20:13:35 +0000 (13:13 -0700)]
Merge "GPS: Changes to enable on-demand data call flow for CDMA connections"
Wink Saville [Thu, 28 Jul 2011 03:39:09 +0000 (20:39 -0700)]
am
d20f60c8: Merge "Support of LTE Only mode" into honeycomb-LTE
* commit '
d20f60c8a71ca0aa853bc433f74b32dcfc98f984':
Support of LTE Only mode
Wink Saville [Thu, 28 Jul 2011 03:35:52 +0000 (20:35 -0700)]
Merge "Support of LTE Only mode" into honeycomb-LTE
Ramesh Sudini [Thu, 28 Jul 2011 03:33:19 +0000 (20:33 -0700)]
Support of LTE Only mode
In CDMA-LTE hybrid mode, the service state is derived based on
CDMA state. However, CDMA radio is off while in LTE only mode
so thre will be no signal bar or data type icon displayed on
the status UI.
This patch handles LTE only mode scenario. The service state
is derived from LTE if CDMA is OOS and LTE only mode is used.
Bug:
5070240
Change-Id: Ie55daaf9eea1b16ca73312ebab208810b145d2bc
Xavier Ducrohet [Thu, 28 Jul 2011 01:40:49 +0000 (18:40 -0700)]
am
0b45ca88: am
cd01ad7c: am
20339b24: Merge "Remove Debug Code"
* commit '
0b45ca8884acfd2e9ccdcb3fbe641a46b116bda0':
Remove Debug Code
Xavier Ducrohet [Thu, 28 Jul 2011 01:38:50 +0000 (18:38 -0700)]
am
cd01ad7c: am
20339b24: Merge "Remove Debug Code"
* commit '
cd01ad7cc7813e3067826945c2a472602f1d3509':
Remove Debug Code
Xavier Ducrohet [Thu, 28 Jul 2011 01:36:17 +0000 (18:36 -0700)]
am
20339b24: Merge "Remove Debug Code"
* commit '
20339b24394be06c5bfe5157a4b35adc48f665eb':
Remove Debug Code
Xavier Ducrohet [Thu, 28 Jul 2011 01:26:01 +0000 (18:26 -0700)]
Merge "Remove Debug Code"
Josiah Gaskin [Thu, 28 Jul 2011 00:45:32 +0000 (17:45 -0700)]
Remove Debug Code
This change removes debugging code from FileFinder.
This code was considered harmful because it uses the std::cout
from <iostream>.
Change-Id: Iad9b5e8a631883bd4854abdb29bc6df8a5b4a056
Ramesh Sudini [Wed, 27 Jul 2011 23:32:48 +0000 (16:32 -0700)]
am
9a87deb5: DataConnection: Clear cid when entering inactive state.
* commit '
9a87deb538caed347621e57c5c83e0185a963bb4':
DataConnection: Clear cid when entering inactive state.
Ramesh Sudini [Wed, 27 Jul 2011 20:36:54 +0000 (15:36 -0500)]
DataConnection: Clear cid when entering inactive state.
Bug:
5083242
Change-Id: I0657739da54bc424433063a2244d045e47411e5f
Xavier Ducrohet [Wed, 27 Jul 2011 21:03:35 +0000 (14:03 -0700)]
am
c682559d: (-s ours) am
4d21c773: am
4d1fa60b: (-s ours) Merge "DO NOT MERGE. may fix build on some version of gcc"
* commit '
c682559d3c39aa4503d5c4d60ae046393aa45b79':
DO NOT MERGE. may fix build on some version of gcc
Xavier Ducrohet [Wed, 27 Jul 2011 21:01:23 +0000 (14:01 -0700)]
am
4d21c773: am
4d1fa60b: (-s ours) Merge "DO NOT MERGE. may fix build on some version of gcc"
* commit '
4d21c7732c978a593dfa78f8da1fed7511b38e95':
DO NOT MERGE. may fix build on some version of gcc
Xavier Ducrohet [Wed, 27 Jul 2011 20:59:57 +0000 (13:59 -0700)]
am
4d1fa60b: (-s ours) Merge "DO NOT MERGE. may fix build on some version of gcc"
* commit '
4d1fa60bfe660fd0fc6671116da597c0027cbb16':
DO NOT MERGE. may fix build on some version of gcc
Xavier Ducrohet [Wed, 27 Jul 2011 20:45:05 +0000 (13:45 -0700)]
Merge "DO NOT MERGE. may fix build on some version of gcc"
Mathias Agopian [Tue, 14 Jun 2011 18:50:22 +0000 (11:50 -0700)]
DO NOT MERGE. may fix build on some version of gcc
Change-Id: Id99d390862731fd3fbc009dbffdf1d2a59dbe348
Robert Greenwalt [Wed, 27 Jul 2011 16:27:00 +0000 (09:27 -0700)]
resolved conflicts for merge of
41394a36 to honeycomb-plus-aosp
Change-Id: Ic839eb7bd8081b94802dbbf9140b9d1fa0cf7df3
Robert Greenwalt [Tue, 26 Jul 2011 20:21:09 +0000 (13:21 -0700)]
Merge "Use dns proxy a bit." into honeycomb-LTE
John Michelau [Tue, 26 Jul 2011 05:26:38 +0000 (22:26 -0700)]
am
ac74551b: Disable name lookups for dumpstate calls to "iptables -L"
* commit '
ac74551bb42eb2d6775d994357481113375574e7':
Disable name lookups for dumpstate calls to "iptables -L"
John Michelau [Tue, 26 Jul 2011 01:42:50 +0000 (20:42 -0500)]
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
Robert Greenwalt [Tue, 26 Jul 2011 00:00:13 +0000 (17:00 -0700)]
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
Wink Saville [Mon, 25 Jul 2011 22:31:44 +0000 (15:31 -0700)]
am
32d106e1: Filter out addresses that are 0.
* commit '
32d106e154d0388ac13774fad3c58ff60ba9ae8f':
Filter out addresses that are 0.
Wink Saville [Mon, 25 Jul 2011 22:26:56 +0000 (15:26 -0700)]
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
Robert Greenwalt [Mon, 25 Jul 2011 21:05:23 +0000 (14:05 -0700)]
Merge "Fix build." into honeycomb-plus-aosp
Robert Greenwalt [Mon, 25 Jul 2011 20:51:18 +0000 (13:51 -0700)]
Fix build.
Add NetworkUtils function missed in manual merge.
Change-Id: Ifce8f2988bb581ddc9b971b8af07a32f46c91e14
Dianne Hackborn [Mon, 25 Jul 2011 19:21:32 +0000 (12:21 -0700)]
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.
Dianne Hackborn [Mon, 25 Jul 2011 19:21:29 +0000 (12:21 -0700)]
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
Xavier Ducrohet [Mon, 25 Jul 2011 19:21:17 +0000 (12:21 -0700)]
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.
Kenny Root [Mon, 25 Jul 2011 19:21:06 +0000 (12:21 -0700)]
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.
Robert Greenwalt [Mon, 25 Jul 2011 19:08:19 +0000 (12:08 -0700)]
resolved conflicts for merge of
26ecc31f to honeycomb-plus-aosp
Change-Id: I23f42e247884f0c9d5ae4d3466213592dd3433d9
Wink Saville [Sun, 24 Jul 2011 16:13:26 +0000 (09:13 -0700)]
am
deb62be2: Merge "Configure RAT dependent retry pattern in GSM DCT." into honeycomb-LTE
* commit '
deb62be2e87b19e9bbbc668f8d9327b12dba4a3b':
Configure RAT dependent retry pattern in GSM DCT.
Kazuhiro Ondo [Sun, 24 Jul 2011 16:11:42 +0000 (09:11 -0700)]
am
4281817f: Allow suggestedRetryTime to indicate no retry is needed.
* commit '
4281817f6b624cb51926eb24fa78c68cd9431dce':
Allow suggestedRetryTime to indicate no retry is needed.
Wink Saville [Sun, 24 Jul 2011 16:11:28 +0000 (09:11 -0700)]
Merge "Configure RAT dependent retry pattern in GSM DCT." into honeycomb-LTE
Kazuhiro Ondo [Sun, 24 Jul 2011 15:08:38 +0000 (08:08 -0700)]
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
Kazuhiro Ondo [Fri, 22 Jul 2011 01:13:52 +0000 (20:13 -0500)]
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
Svetoslav Ganov [Sat, 23 Jul 2011 00:07:28 +0000 (17:07 -0700)]
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.
Svetoslav Ganov [Sat, 23 Jul 2011 00:05:26 +0000 (17:05 -0700)]
Merge "DO NOT MERGE AccessibilityInjectorTest did not restore the default key binsings." into honeycomb-LTE
Robert Greenwalt [Fri, 22 Jul 2011 20:15:56 +0000 (13:15 -0700)]
am
ad55d351: Add better routes for secondary DNS
* commit '
ad55d35114237071133eb28ded93a014185d4e35':
Add better routes for secondary DNS
Robert Greenwalt [Fri, 22 Jul 2011 18:55:33 +0000 (11:55 -0700)]
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
Dianne Hackborn [Fri, 22 Jul 2011 05:37:13 +0000 (22:37 -0700)]
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.
Dianne Hackborn [Fri, 22 Jul 2011 05:35:32 +0000 (22:35 -0700)]
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.
Dianne Hackborn [Fri, 22 Jul 2011 05:26:20 +0000 (22:26 -0700)]
am
1a2fcea1: am
2f4698fd: Merge "frameworks/base: unlink death notifications of Vibrate requests"
* commit '
1a2fcea1a28074f15126471daa5a8650cb5e2ecc':
frameworks/base: unlink death notifications of Vibrate requests
Dianne Hackborn [Fri, 22 Jul 2011 05:23:46 +0000 (22:23 -0700)]
am
2f4698fd: Merge "frameworks/base: unlink death notifications of Vibrate requests"
* commit '
2f4698fda46a3d2a6e78019588d77bae1cfa7193':
frameworks/base: unlink death notifications of Vibrate requests
Dianne Hackborn [Fri, 22 Jul 2011 05:21:19 +0000 (22:21 -0700)]
Merge "frameworks/base: Cap the number of toasts that a package can post."
Dianne Hackborn [Fri, 22 Jul 2011 05:18:47 +0000 (22:18 -0700)]
Merge "frameworks/base: unlink death notifications of Vibrate requests"
Svetoslav Ganov [Mon, 27 Jun 2011 19:38:29 +0000 (12:38 -0700)]
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
Kazuhiro Ondo [Fri, 22 Jul 2011 01:15:26 +0000 (18:15 -0700)]
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
Kazuhiro Ondo [Wed, 20 Jul 2011 23:55:47 +0000 (18:55 -0500)]
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
Xavier Ducrohet [Thu, 21 Jul 2011 23:25:50 +0000 (16:25 -0700)]
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.
Xavier Ducrohet [Thu, 21 Jul 2011 23:23:18 +0000 (16:23 -0700)]
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.
Xavier Ducrohet [Thu, 21 Jul 2011 23:17:03 +0000 (16:17 -0700)]
Merge "Layoutlib_create flag -p: don't change all accesses to public."
Kenny Root [Thu, 21 Jul 2011 20:11:01 +0000 (13:11 -0700)]
am
4f3a8db6: am
3cf03987: Merge "Continue idmap generation even if name lookup fails."
* commit '
4f3a8db64d75cd3e88213d3b105dc50fc5bd6262':
Continue idmap generation even if name lookup fails.
Kenny Root [Thu, 21 Jul 2011 20:09:05 +0000 (13:09 -0700)]
am
3cf03987: Merge "Continue idmap generation even if name lookup fails."
* commit '
3cf039876177b5b314b635bb12a1dae1b42f4605':
Continue idmap generation even if name lookup fails.
Kenny Root [Thu, 21 Jul 2011 20:05:03 +0000 (13:05 -0700)]
Merge "Continue idmap generation even if name lookup fails."
Robert Greenwalt [Thu, 21 Jul 2011 18:29:05 +0000 (11:29 -0700)]
am
594745ab: am
b9f87f19: Merge "First pass tying into per-interface DNS cache"
* commit '
594745abefe53abe7f577bbb3cc176d52ee00ba1':
First pass tying into per-interface DNS cache
Robert Greenwalt [Thu, 21 Jul 2011 18:28:01 +0000 (11:28 -0700)]
am
b9f87f19: Merge "First pass tying into per-interface DNS cache"
* commit '
b9f87f1970217d24213c8e3dd7755a0e4d82f8eb':
First pass tying into per-interface DNS cache
Robert Greenwalt [Thu, 21 Jul 2011 18:16:12 +0000 (11:16 -0700)]
Merge "First pass tying into per-interface DNS cache"
Xavier Ducrohet [Thu, 21 Jul 2011 01:55:21 +0000 (18:55 -0700)]
am
3a2d1c23: am
ddb8e3b2: am
9bac0a9f: Merge "Fix to compile for windows"
* commit '
3a2d1c2351c0b4eeb4dc4d91d1c334b9f8ba00ed':
Fix to compile for windows
Xavier Ducrohet [Thu, 21 Jul 2011 01:53:08 +0000 (18:53 -0700)]
am
ddb8e3b2: am
9bac0a9f: Merge "Fix to compile for windows"
* commit '
ddb8e3b24b2fe3e4371ca8c1239748f5c71910f6':
Fix to compile for windows
Xavier Ducrohet [Thu, 21 Jul 2011 01:49:46 +0000 (18:49 -0700)]
am
9bac0a9f: Merge "Fix to compile for windows"
* commit '
9bac0a9f93976ff341fc9c46b3a85be767119a88':
Fix to compile for windows
Xavier Ducrohet [Thu, 21 Jul 2011 01:35:35 +0000 (18:35 -0700)]
Merge "Fix to compile for windows"
Josiah Gaskin [Thu, 21 Jul 2011 00:33:08 +0000 (17:33 -0700)]
Fix to compile for windows
This change includes a workaround for dirent.h on windows not
including d_type.
Change-Id: Ieaa3f298d2e6b32f2d8367384a1d02a2f5d06cca
Xavier Ducrohet [Thu, 21 Jul 2011 00:45:11 +0000 (17:45 -0700)]
resolved conflicts for merge of
ea9e6d24 to honeycomb-plus-aosp
Change-Id: I8e047147a4d2c899b6654c03a5f32b04d929e602
Xavier Ducrohet [Wed, 20 Jul 2011 23:31:25 +0000 (16:31 -0700)]
resolved conflicts for merge of
2c311be7 to honeycomb-plus-aosp
Change-Id: I806c7b4ae95f66df621587e52497dd8739a115fe