OSDN Git Service
Robert Greenwalt [Mon, 14 Jan 2013 17:53:18 +0000 (09:53 -0800)]
am
43682d94: Fix a TOCTOU and symlink attack in netd.
* commit '
43682d9474a2c89ddecc9fcc818df40e4f5424ee':
Fix a TOCTOU and symlink attack in netd.
Robert Greenwalt [Thu, 29 Nov 2012 23:44:25 +0000 (15:44 -0800)]
Fix a TOCTOU and symlink attack in netd.
Bug:
7530471
Change-Id: I3b0a38a203bdeba6c492a54fded056a16992e34e
jp abgrall [Wed, 12 Sep 2012 03:38:42 +0000 (20:38 -0700)]
Merge "Don't include <linux/...> header files directly."
Elliott Hughes [Wed, 12 Sep 2012 01:56:36 +0000 (18:56 -0700)]
Don't include <linux/...> header files directly.
These change from kernel release to release, and no longer contain some of
the stuff you need.
Change-Id: I3fc7176cf2246aebfc0aa2a833dfa04ea8d931fc
Jean-Baptiste Queru [Mon, 20 Aug 2012 16:20:10 +0000 (09:20 -0700)]
Merge "Fix race condition in pthread_create()"
Jurijs Oniscuks [Thu, 5 Jul 2012 13:35:05 +0000 (15:35 +0200)]
Fix race condition in pthread_create()
Do not send "&this->mThread" to pthread_create() as newly
created thread can "delete this" before pthread_create() saves
thread id. This would lead to heap corruption.
Change-Id: I9c4cd5e1002b85985514a36ae542778a783db6fb
Jean-Baptiste Queru [Thu, 14 Jun 2012 22:34:31 +0000 (15:34 -0700)]
resolved conflicts for merge of
e36a3a2f to jb-dev-plus-aosp
Change-Id: I566b0e96327f318313c17a11d35539554b075f59
Jean-Baptiste Queru [Thu, 14 Jun 2012 20:12:30 +0000 (13:12 -0700)]
Merge "Run dnsmasq with options --keep-in-foreground and --pid-file."
The Android Open Source Project [Wed, 16 May 2012 15:41:17 +0000 (08:41 -0700)]
Reconcile with jb-release nakasi-factoryrom-release
Change-Id: I51d86c45479eb7be5e06325d344a6d1c21fd5247
The Android Automerger [Wed, 9 May 2012 14:47:36 +0000 (07:47 -0700)]
merge in jb-release history after reset to jb-dev
JP Abgrall [Tue, 8 May 2012 21:48:45 +0000 (14:48 -0700)]
netd: NetlinkHandler: explicitly ignore "platform" and "backlight" events
The new vsync api uses uevents to notify userspace... 60 events/sec. :(
Don't log unexpected event's subsystem if it is one of the known ones.
Change-Id: Ie900898b326c9451b76ac5f6ba047870fd62093a
Peter Nilsson [Thu, 8 Sep 2011 16:48:31 +0000 (09:48 -0700)]
Run dnsmasq with options --keep-in-foreground and --pid-file.
Tell dnsmasq to run with option --keep-in-foreground instead
of --no-daemon, which is meant for debug purposes only. Also
use option --pid-file to tell dnsmasq not use a pid file.
Change-Id: I82858d911e94407b2511d8ce8388be553f2f09f6
JP Abgrall [Thu, 3 May 2012 19:52:15 +0000 (12:52 -0700)]
BandwidthController: Fix double counting
Only have qtaguid only count in the bw_INPUT/bw_OUTPUT chains
and not in the costly_* subchains.
We don't use --goto anymore.
Change-Id: I2eded2e0fa12b46843d32e74406cfeda85f242d1
The Android Automerger [Mon, 30 Apr 2012 14:06:08 +0000 (07:06 -0700)]
merge in jb-release history after reset to jb-dev
JP Abgrall [Fri, 27 Apr 2012 08:02:31 +0000 (01:02 -0700)]
BandwidthController: Avoid setting a uid multiple times in NaughtyApps
Use the naughtyAppUids list before inserting a new app.
Bug:
6292513
Change-Id: I6726b7d589569a6198b8a0ff32c32c0e40ed5319
JP Abgrall [Fri, 27 Apr 2012 07:22:57 +0000 (00:22 -0700)]
BandwidthController: hookup qtaguid for tracking closest to devices.
Before, qtaguid would rely on netdev (up/down) callbacks to read out the
dev rx/tx stats.
Now it uses (raw) PREROUTING and (mangle) POSTROUTING iptable hooks.
We use mangle on the out path because nat is not available in ipv6.
The NatController only masquerades in nat POSTROUTING so we don't count
traffic that might get dropped.
Bug:
5444089
Change-Id: I997b8b3c81264a545f1f575baaf0445c0afc8f72
JP Abgrall [Fri, 27 Apr 2012 07:02:53 +0000 (00:02 -0700)]
netd: Netlink: Use KOBJECT_UEVENT instead of IDLETIMER
The initial idletimer support required using NETLINK_IDLETIMER
netlink socket type.
Instead we now just re-use the existing KOBJECT_UEVENT socket.
Change-Id: I951f2f29182c7cf7f29a054a0eabc88dc25f6d1f
JP Abgrall [Wed, 25 Apr 2012 06:27:44 +0000 (23:27 -0700)]
bandwidthcontroller: hide iptables errors when they don't matter
Some commands are run to be able to recover after failures.
Those cleanup commands are generally allowed to fail.
But the lower level system commands would log an error.
Now that error is hidden if nobody will care about the result.
A "#define LOG_NDEBUG 0" will show those failing commands.
Removed leftover LOG_NDEBUG in CommandListener.
Bug:
6377175
Change-Id: I1205fb077f7d0496969bd2a0b5da42025bc5a8dc
JP Abgrall [Wed, 25 Apr 2012 04:30:43 +0000 (21:30 -0700)]
netd: NatController: don't setup iptables hooks in constructor.
iptables top-level chain updates should happen within CommandListener()
when it invokes the various modules' setupIptablesHooks().
And remove the extra DROP rule.
Change-Id: I33d2cfbd5444516f855ff85152c472352944cc77
The Android Automerger [Wed, 25 Apr 2012 14:50:05 +0000 (07:50 -0700)]
merge in jb-release history after reset to jb-dev
Robert Greenwalt [Tue, 24 Apr 2012 16:54:38 +0000 (09:54 -0700)]
Merge "Store certain MDNS fields as quoted strings"
The Android Automerger [Mon, 23 Apr 2012 14:08:15 +0000 (07:08 -0700)]
merge in jb-release history after reset to master
Robert Greenwalt [Fri, 20 Apr 2012 21:22:54 +0000 (14:22 -0700)]
Store certain MDNS fields as quoted strings
They sometimes contain spaces so a space-delimited response requires more care.
bug:
6353048
Change-Id: I84d5cc156bf4d9f1419b7202e9aa00ddb7209b2f
JP Abgrall [Tue, 17 Apr 2012 23:38:23 +0000 (16:38 -0700)]
netd: Idletimer vs Nat vs Bandwidth controllers
* modified iptables users to work in controller specific custom chains.
- each controller only works withing his own custom chains and not the
top level ones (INPUT, OUTPUT, FORWARD, POSTROUTING,...)
- CommandListener now invokes setupIptablesHooks() for each controller
once. That is the only time they are allowed to access the top-level
chains.
* Added idletimer controller.
From https://android-git.corp.google.com/g/#/c/180769/2
- supported commands
. ndc idletimer enable
. ndc idletimer add <iface> <timeout>
. ndc idletimer remove <iface> <timeout_used_during_add>
There is a framework change elsewhere that receives netlink messages.
Signed-off-by: Ashish Sharma <ashishsharma@google.com>
Signed-off-by: JP Abgrall <jpa@google.com>
Change-Id: Ia57450c09166ce20f21d1e3b49047ef1e98f2a3d
Jeff Sharkey [Thu, 19 Apr 2012 04:53:35 +0000 (21:53 -0700)]
Add "metered" flag to DHCP offer vendor info.
Bug:
6344821
Change-Id: Ic8cd235a1cbdd848ff839f6f0f03161de2090751
The Android Automerger [Mon, 16 Apr 2012 14:06:29 +0000 (07:06 -0700)]
merge in jb-release history after reset to master
Robert Greenwalt [Thu, 29 Mar 2012 21:45:54 +0000 (14:45 -0700)]
Initial release of mdns interface.
Uses extern/mdnsresponder and communicate with the framework via nativedaemonconnector.
Change-Id: I5c090528197afa090836d7cb5bf75dfba33ff11c
Ashish Sharma [Wed, 11 Apr 2012 02:47:09 +0000 (19:47 -0700)]
netd: Add support for interface idletimer netlink notifications.
Change-Id: Ifda5b8ecf68533eea42b133dbe0a581b4401ab11
Mike Lockwood [Tue, 3 Apr 2012 17:32:37 +0000 (10:32 -0700)]
Merge remote-tracking branch 'goog/ics-aah'
The Android Open Source Project [Wed, 21 Mar 2012 16:09:01 +0000 (09:09 -0700)]
The Android Open Source Project [Wed, 21 Mar 2012 16:06:32 +0000 (09:06 -0700)]
am
99c65114: Reconcile with ics-mr1-release
* commit '
99c65114b976fd8ceb54021cede0dd63f8826a02':
The Android Open Source Project [Wed, 21 Mar 2012 16:01:27 +0000 (09:01 -0700)]
Reconcile with ics-mr1-release
Change-Id: I6cf64c289005dccb3d60c972686b7c335aa015a4
The Android Open Source Project [Wed, 21 Mar 2012 15:29:30 +0000 (08:29 -0700)]
The Android Open Source Project [Wed, 21 Mar 2012 15:26:54 +0000 (08:26 -0700)]
am
17654593: Reconcile with ics-mr1-release
* commit '
176545930d60a366734bbf70c3b60332a606c01e':
The Android Open Source Project [Wed, 21 Mar 2012 15:23:48 +0000 (08:23 -0700)]
Reconcile with ics-mr1-release
Change-Id: If53997c291c7c51332b57f572fbbfc70f7527166
The Android Automerger [Wed, 21 Mar 2012 14:06:19 +0000 (07:06 -0700)]
merge in jb-release history after reset to master
Dmitry Shmidt [Fri, 16 Mar 2012 19:33:34 +0000 (12:33 -0700)]
softap: Remove wmm_enabled=1 flag from SoftAP config
Change-Id: Id2b43001d95259fbaf25108bf95dfae3802b79bf
Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>
The Android Automerger [Mon, 12 Mar 2012 14:06:54 +0000 (07:06 -0700)]
merge in jb-release history after reset to master
The Android Automerger [Sat, 10 Mar 2012 17:07:33 +0000 (09:07 -0800)]
merge in ics-mr1-release history after reset to ics-mr1
The Android Automerger [Sat, 10 Mar 2012 03:24:06 +0000 (19:24 -0800)]
merge in ics-mr1-release history after reset to ics-mr1
Selim Gurun [Fri, 9 Mar 2012 19:21:54 +0000 (11:21 -0800)]
Merge "We are not reverting this CL since it was a temporary fix and we just submitted the proper one."
Selim Gurun [Fri, 9 Mar 2012 19:21:35 +0000 (11:21 -0800)]
We are not reverting this CL since it was a temporary fix and we just submitted the proper one.
Revert "Do not send extra data the client is not consuming."
This reverts commit
6217272e1a41fc9827250c675a0499d2091ec6ac
Selim Gurun [Fri, 9 Mar 2012 19:14:51 +0000 (11:14 -0800)]
Merge "Ignore Sigpipe in netd"
Dmitry Shmidt [Fri, 9 Mar 2012 17:48:03 +0000 (09:48 -0800)]
Merge "ndc: Add default sequence number to command"
Selim Gurun [Fri, 9 Mar 2012 16:59:28 +0000 (08:59 -0800)]
Ignore Sigpipe in netd
Bug:
6141847
Ignore sigpipe in netd. This will enable us remove the temporary
changes in DnsProxyListener that we added to temporarily resolve
issue
6138617.
Change-Id: I4bc13ac0fcf9dd0e7641c2d4459b1eab0ed50f2a
The Android Automerger [Fri, 9 Mar 2012 04:46:18 +0000 (20:46 -0800)]
merge in ics-mr1-release history after reset to ics-mr1
Selim Gurun [Fri, 9 Mar 2012 02:17:48 +0000 (18:17 -0800)]
Do not send extra data the client is not consuming.
Bug:
6138617
This is to temporarily fix a problem in netd. In case of an error do
not send extra data that the client is not expecting. This causes a
netd crash.
Change-Id: Iadb375e326577857034c2a7d2e962e4242d4735f
Selim Gurun [Fri, 9 Mar 2012 02:17:48 +0000 (18:17 -0800)]
Do not send extra data the client is not consuming.
Bug:
6138617
This is to temporarily fix a problem in netd. In case of an error do
not send extra data that the client is not expecting. This causes a
netd crash.
Change-Id: Iadb375e326577857034c2a7d2e962e4242d4735f
Dmitry Shmidt [Fri, 9 Mar 2012 02:16:22 +0000 (18:16 -0800)]
ndc: Add default sequence number to command
Change-Id: I81ec40b8dd560eb9b6430eafc05d5e7714e0f042
Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>
Nick Kralevich [Thu, 8 Mar 2012 02:15:28 +0000 (18:15 -0800)]
am
e1176866: am
88ec4ed2: am
1babab9f: netd: do check on command, not buffer.
* commit '
e1176866629c90bc1403926186bf2b7efc736a2a':
Nick Kralevich [Thu, 8 Mar 2012 02:15:27 +0000 (18:15 -0800)]
am
e2f132b7: (-s ours) am
19d7b786: am
1babab9f: netd: do check on command, not buffer.
* commit '
e2f132b7a224d1c2287292132b93f53b09d617cd':
netd: do check on command, not buffer.
Selim Gurun [Thu, 8 Mar 2012 01:05:31 +0000 (17:05 -0800)]
Merge "Prevent potential stall on dns proxy operations."
Nick Kralevich [Wed, 7 Mar 2012 22:38:08 +0000 (14:38 -0800)]
am
88ec4ed2: am
1babab9f: netd: do check on command, not buffer.
* commit '
88ec4ed21deb1340675ba026fda46e6183c2e219':
Nick Kralevich [Wed, 7 Mar 2012 22:37:24 +0000 (14:37 -0800)]
am
19d7b786: am
1babab9f: netd: do check on command, not buffer.
* commit '
19d7b786eed1c69a2d9d6d0764ad9cf8e97b9f72':
netd: do check on command, not buffer.
Nick Kralevich [Wed, 7 Mar 2012 22:35:31 +0000 (14:35 -0800)]
am
1babab9f: netd: do check on command, not buffer.
* commit '
1babab9febdbd05b7b6d72e0728f49ee8d4b9bd2':
netd: do check on command, not buffer.
Nick Kralevich [Wed, 7 Mar 2012 22:35:12 +0000 (14:35 -0800)]
am
1babab9f: netd: do check on command, not buffer.
* commit '
1babab9febdbd05b7b6d72e0728f49ee8d4b9bd2':
netd: do check on command, not buffer.
Nick Kralevich [Wed, 7 Mar 2012 22:34:56 +0000 (14:34 -0800)]
am
1babab9f: netd: do check on command, not buffer.
* commit '
1babab9febdbd05b7b6d72e0728f49ee8d4b9bd2':
netd: do check on command, not buffer.
Nick Kralevich [Wed, 7 Mar 2012 20:54:41 +0000 (12:54 -0800)]
netd: do check on command, not buffer.
Bug:
6132094
Change-Id: I76aef21b07c07db76bbc6587ae732b1ceb4488ce
Nick Kralevich [Wed, 7 Mar 2012 19:53:10 +0000 (11:53 -0800)]
netd: do check on command, not buffer.
Bug:
6132094
Change-Id: Icb3b0d0b2a0fd795c05162afc8791729bfa5d075
Glenn Kasten [Wed, 7 Mar 2012 15:16:35 +0000 (07:16 -0800)]
Merge "Remove reference to hard-coded cpuctl path for bg"
Robert Greenwalt [Tue, 6 Mar 2012 19:30:35 +0000 (11:30 -0800)]
Merge "Use the new command numbering scheme."
Glenn Kasten [Mon, 5 Mar 2012 23:13:58 +0000 (15:13 -0800)]
Remove reference to hard-coded cpuctl path for bg
As part of scheduling policy cleanup, remove/isolate references to the
scheduling policy files and APIs.
In this case, logwrap is not used currently due to bug
5144246, and even
if it were the "background" parameter was 0.
Change-Id: Ibf7fa2617a0e485c9868b22b378636728d16622a
Mathias Agopian [Tue, 6 Mar 2012 02:29:42 +0000 (18:29 -0800)]
Merge "remove dependency on utils/List.h"
Mathias Agopian [Tue, 6 Mar 2012 01:05:02 +0000 (17:05 -0800)]
remove dependency on utils/List.h
Change-Id: I45c7e2cf9fe07f65259af6fa22d719259386912c
The Android Open Source Project [Sat, 3 Mar 2012 00:48:33 +0000 (16:48 -0800)]
The Android Open Source Project [Sat, 3 Mar 2012 00:44:17 +0000 (16:44 -0800)]
am
c91e3d47: Reconcile with ics-mr1-release
* commit '
c91e3d476a8002fc6e8f994152be5dc4b3b85489':
The Android Open Source Project [Sat, 3 Mar 2012 00:41:44 +0000 (16:41 -0800)]
Reconcile with ics-mr1-release
Change-Id: I94123eabf7bde1c98440858acbddacca8f91c4bb
The Android Open Source Project [Sat, 3 Mar 2012 00:37:53 +0000 (16:37 -0800)]
The Android Open Source Project [Sat, 3 Mar 2012 00:35:25 +0000 (16:35 -0800)]
am
4d00f912: Reconcile with ics-mr1-release
* commit '
4d00f91201adc92d2d7fc56322f264db2fa7c816':
The Android Open Source Project [Sat, 3 Mar 2012 00:33:57 +0000 (16:33 -0800)]
Reconcile with ics-mr1-release
Change-Id: I939f27b0ec63aa664bd606bd6ac7af4433d67c18
The Android Automerger [Fri, 2 Mar 2012 19:52:34 +0000 (11:52 -0800)]
merge in ics-mr1-release history after reset to ics-mr1
Selim Gurun [Tue, 28 Feb 2012 00:01:42 +0000 (16:01 -0800)]
Prevent potential stall on dns proxy operations.
Update wire protocol to return and process error code first. This
will make sure dns proxy operations do not stall when an internal
error happens.
Change-Id: I65595abb0638722ccd877f69057bd435ca06e524
Jaime A Lopez-Sollano [Thu, 1 Mar 2012 17:08:30 +0000 (09:08 -0800)]
am
b7aeeb6c: am
500e77d5: am
3c20787d: Increase the valid name of the iface to IFNAMSIZ
* commit '
b7aeeb6cf2d473639b1a495361d888cbf52ab6c5':
Robert Greenwalt [Thu, 16 Feb 2012 22:48:11 +0000 (14:48 -0800)]
Use the new command numbering scheme.
Support multiple commands on a single socket via command numbers.
Native DaemonConnector has been changed, so we need to use it here
too.
bug:
5864209
Change-Id: I084a284db38b996e7965bb9dd18440636eff9801
Robert Greenwalt [Wed, 29 Feb 2012 22:06:33 +0000 (14:06 -0800)]
resolved conflicts for merge of
924e6e4d to master
Change-Id: I98212c9d7004a9ae38e463036ae6ca97b9569dda
Jaime A Lopez-Sollano [Wed, 29 Feb 2012 20:17:58 +0000 (12:17 -0800)]
am
500e77d5: am
3c20787d: Increase the valid name of the iface to IFNAMSIZ
* commit '
500e77d5f596b9ee488ff2cf4309d81525c0d6fd':
Jaime A Lopez-Sollano [Wed, 29 Feb 2012 20:16:40 +0000 (12:16 -0800)]
am
7de67315: am
3c20787d: Increase the valid name of the iface to IFNAMSIZ
* commit '
7de673157ed86b0ba4705a071380a103c1d1841e':
Increase the valid name of the iface to IFNAMSIZ
Jaime A Lopez-Sollano [Wed, 29 Feb 2012 20:14:17 +0000 (12:14 -0800)]
am
3c20787d: Increase the valid name of the iface to IFNAMSIZ
* commit '
3c20787d7935c2016e8e3cc49d8f15647c12c41c':
Increase the valid name of the iface to IFNAMSIZ
Jaime A Lopez-Sollano [Wed, 29 Feb 2012 20:13:49 +0000 (12:13 -0800)]
am
3c20787d: Increase the valid name of the iface to IFNAMSIZ
* commit '
3c20787d7935c2016e8e3cc49d8f15647c12c41c':
Increase the valid name of the iface to IFNAMSIZ
Jaime A Lopez-Sollano [Wed, 29 Feb 2012 20:13:48 +0000 (12:13 -0800)]
am
3c20787d: Increase the valid name of the iface to IFNAMSIZ
* commit '
3c20787d7935c2016e8e3cc49d8f15647c12c41c':
Increase the valid name of the iface to IFNAMSIZ
Jaime A Lopez-Sollano [Thu, 12 Jan 2012 00:29:28 +0000 (16:29 -0800)]
Increase the valid name of the iface to IFNAMSIZ
Define MAX_IFACE_LENGTH as IFNAMSIZ instead of 10, to
prevent netd from treating an interface name 'rmnet_sdio0'
as invalid.
Also fix an off-by-one error.
bug:
5675718
Change-Id: I2b6ba823c89941031e5898b24dab388cd9c2dae8
Dmitry Shmidt [Wed, 29 Feb 2012 18:00:23 +0000 (10:00 -0800)]
Merge "netd: softap: Add ieee80211n=1 parameter for hotspot"
Dmitry Shmidt [Tue, 28 Feb 2012 20:41:45 +0000 (12:41 -0800)]
netd: softap: Add ieee80211n=1 parameter for hotspot
Change-Id: I73d862494c186a08066d8e3478667055bfc831a1
Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>
Nick Kralevich [Thu, 23 Feb 2012 21:04:26 +0000 (13:04 -0800)]
BandwidthController: fix format string bugs
In
876666947664c718a8d0cae9bbddb06cc91f912c, a new %s
was added to ALERT_IPT_TEMPLATE. Not all users of this string
were updated.
This change modifies ALERT_IPT_TEMPLATE to be a #define, which
allows gcc's format string detection work.
Add -Werror=format to error out on any string format warning.
Testing: Code compiles. I don't know how to test this change
properly.
Bug:
5948299
Change-Id: I0ec307972e6bf50abd8ba099166c22069a6c6580
Dmitry Shmidt [Mon, 13 Feb 2012 18:29:23 +0000 (10:29 -0800)]
netd: softap: Add wmm_enabled=1 option
Change-Id: I3742e1130e3d9e3074a67f2e1bdd13ef11bb77dc
Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>
Robert Greenwalt [Wed, 1 Feb 2012 18:16:07 +0000 (10:16 -0800)]
Merge "Increase the valid name of the iface to IFNAMSIZ"
The Android Open Source Project [Wed, 1 Feb 2012 18:05:46 +0000 (10:05 -0800)]
The Android Open Source Project [Wed, 1 Feb 2012 18:01:09 +0000 (10:01 -0800)]
am
ad8126d0: Reconcile with ics-mr1-release
* commit '
ad8126d0199af924f8036a81297e1f67c3bba7ab':
The Android Open Source Project [Wed, 1 Feb 2012 16:50:53 +0000 (08:50 -0800)]
Reconcile with ics-mr1-release
Change-Id: Ica795e32aa94c9ea21b4a4f2acd84a9979c59c09
Jaime A Lopez-Sollano [Thu, 12 Jan 2012 00:29:28 +0000 (16:29 -0800)]
Increase the valid name of the iface to IFNAMSIZ
Define MAX_IFACE_LENGTH as IFNAMSIZ instead of 10, to
prevent netd from treating an interface name 'rmnet_sdio0'
as invalid.
Also fix an off-by-one error.
Change-Id: If6b2b27d2da6eb72f01c090cbe4f7dc2b9c296ae
Robert Greenwalt [Wed, 1 Feb 2012 00:39:56 +0000 (16:39 -0800)]
Merge "Keep better tabs on secondary tables."
Robert Greenwalt [Tue, 31 Jan 2012 20:46:45 +0000 (12:46 -0800)]
Keep better tabs on secondary tables.
We had some places (NatController) where routes were being set
but not accounted for in the number-of-routes talley so we
could end up thinking the table was empty and not clean up
after ourselves properly.
Also consolidated constants.
bug:
5917475
Change-Id: I98a41d433e1d4b4ca6692fb2328e2c9afc828145
The Android Open Source Project [Fri, 20 Jan 2012 23:52:24 +0000 (15:52 -0800)]
am
a201914b: Reconcile with ics-mr1-release
* commit '
a201914b3b2f6910b4ce4d58a4f170d9ebaeb174':
The Android Open Source Project [Thu, 19 Jan 2012 21:07:15 +0000 (13:07 -0800)]
Reconcile with ics-mr1-release
Change-Id: I2e12ef9428b2f10e7cc87199edfa090cb9c7167e
JP Abgrall [Thu, 19 Jan 2012 19:44:24 +0000 (11:44 -0800)]
netd: Rename LOGI/LOGE to ALOGI/ALOGE
The merge from ics-mr1 branch pulled in some oldschool LOGE/LOGI calls.
Change-Id: I3c452198375c4cdce085307e844f1d6aa491225b
Kazuhiro Ondo [Thu, 19 Jan 2012 18:54:39 +0000 (10:54 -0800)]
am
b210b180: am
4ab46857: Add back hook for inserting OEM specific iptables rules.
* commit '
b210b1806c740bf66eb04eb8e8d8ee75c01652dd':
Add back hook for inserting OEM specific iptables rules.
The Android Automerger [Thu, 19 Jan 2012 05:18:48 +0000 (21:18 -0800)]
merge in ics-mr1-release history after reset to ics-mr1
Kazuhiro Ondo [Thu, 19 Jan 2012 00:14:21 +0000 (16:14 -0800)]
am
4ab46857: Add back hook for inserting OEM specific iptables rules.
* commit '
4ab468577647d1ee73810b89d2287eaa5546fecb':
Add back hook for inserting OEM specific iptables rules.
Kazuhiro Ondo [Thu, 19 Jan 2012 00:10:21 +0000 (16:10 -0800)]
am
4ab46857: Add back hook for inserting OEM specific iptables rules.
* commit '
4ab468577647d1ee73810b89d2287eaa5546fecb':
Add back hook for inserting OEM specific iptables rules.
Kazuhiro Ondo [Thu, 12 Jan 2012 22:15:06 +0000 (16:15 -0600)]
Add back hook for inserting OEM specific iptables rules.
The functionality was lost during merge in ICS branch.
This patch is adding back OEM iptables hook in netd.
Bug:
5862460
Change-Id: I9444b8c53e8b84fea2002c2c1d9ba42e45ae5f0c