drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
49,935 Commits 1 Branch 0 Tags
Commit Graph

49935 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Mike Lockwood
21700fedfe am 5f7203eb: am 5a27a754: am bd1dee94: Merge "gps: Adding ip address for AGps" 
* commit '5f7203eb258503bc5d2ba29176bdf483a68a93b8':
  gps: Adding ip address for AGps
 2011-07-28 14:04:13 -07:00
Mike Lockwood
5f7203eb25 am 5a27a754: am bd1dee94: Merge "gps: Adding ip address for AGps" 
* commit '5a27a7543edbd09a56e36d04adb4cfab922e6346':
  gps: Adding ip address for AGps
 2011-07-28 14:02:14 -07:00
Mike Lockwood
5a27a7543e am bd1dee94: Merge "gps: Adding ip address for AGps" 
* commit 'bd1dee94dfe2e1d7564cae3c8c6be53cc4e66998':
  gps: Adding ip address for AGps
 2011-07-28 14:00:27 -07:00
Mike Lockwood
bd1dee94df Merge "gps: Adding ip address for AGps" 2011-07-28 13:52:55 -07:00
Stephen Li
8efd74dbed gps: Adding ip address for AGps 
Change-Id: Ic590187d159853de2f1bd2912e159f0a00d8fb10
 2011-07-28 16:50:45 -04:00
Mike Lockwood
f8d13e535c 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
 2011-07-28 13:27:27 -07:00
Mike Lockwood
bf676d460d 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
 2011-07-28 13:25:34 -07:00
Mike Lockwood
7083ed44ee 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
 2011-07-28 13:23:01 -07:00
Mike Lockwood
0ff79e88e2 Merge "GPS: Changes to enable on-demand data call flow for CDMA connections" 2011-07-28 13:13:35 -07:00
Wink Saville
5ad5c9e3ef am d20f60c8: Merge "Support of LTE Only mode" into honeycomb-LTE 
* commit 'd20f60c8a71ca0aa853bc433f74b32dcfc98f984':
  Support of LTE Only mode
 2011-07-27 20:39:09 -07:00
Wink Saville
d20f60c8a7 Merge "Support of LTE Only mode" into honeycomb-LTE 2011-07-27 20:35:52 -07:00
Ramesh Sudini
d5f8d84d45 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
 2011-07-27 20:34:15 -07:00
Xavier Ducrohet
6abf2f501e am 0b45ca88: am cd01ad7c: am 20339b24: Merge "Remove Debug Code" 
* commit '0b45ca8884acfd2e9ccdcb3fbe641a46b116bda0':
  Remove Debug Code
 2011-07-27 18:40:49 -07:00
Xavier Ducrohet
0b45ca8884 am cd01ad7c: am 20339b24: Merge "Remove Debug Code" 
* commit 'cd01ad7cc7813e3067826945c2a472602f1d3509':
  Remove Debug Code
 2011-07-27 18:38:50 -07:00
Xavier Ducrohet
cd01ad7cc7 am 20339b24: Merge "Remove Debug Code" 
* commit '20339b24394be06c5bfe5157a4b35adc48f665eb':
  Remove Debug Code
 2011-07-27 18:36:17 -07:00
Xavier Ducrohet
20339b2439 Merge "Remove Debug Code" 2011-07-27 18:26:01 -07:00
Josiah Gaskin
7a09ccfb50 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
 2011-07-27 17:45:32 -07:00
Ramesh Sudini
8ce53e387e am 9a87deb5: DataConnection: Clear cid when entering inactive state. 
* commit '9a87deb538caed347621e57c5c83e0185a963bb4':
  DataConnection: Clear cid when entering inactive state.
 2011-07-27 16:32:48 -07:00
Ramesh Sudini
9a87deb538 DataConnection: Clear cid when entering inactive state. 
Bug: 5083242

Change-Id: I0657739da54bc424433063a2244d045e47411e5f
 2011-07-27 15:04:24 -07:00
Xavier Ducrohet
6499407734 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
 2011-07-27 14:03:35 -07:00
Xavier Ducrohet
c682559d3c 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
 2011-07-27 14:01:23 -07:00
Xavier Ducrohet
4d21c7732c 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
 2011-07-27 13:59:57 -07:00
Xavier Ducrohet
4d1fa60bfe Merge "DO NOT MERGE. may fix build on some version of gcc" 2011-07-27 13:45:05 -07:00
Mathias Agopian
913a5a3cc6 DO NOT MERGE. may fix build on some version of gcc 
Change-Id: Id99d390862731fd3fbc009dbffdf1d2a59dbe348
 2011-07-27 11:31:57 -07:00
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