OSDN Git Service
Lorenzo Colitti [Wed, 20 Nov 2013 02:24:18 +0000 (02:24 +0000)]
Merge "Simplify notification code in NetlinkHandler."
Lorenzo Colitti [Wed, 20 Nov 2013 02:23:52 +0000 (02:23 +0000)]
Merge "Don't log "Unexpected netlink message" on NDUSEROPT"
Lorenzo Colitti [Wed, 20 Nov 2013 02:23:43 +0000 (02:23 +0000)]
Merge "Unbreak interface add/delete notifications."
Lorenzo Colitti [Wed, 20 Nov 2013 02:23:28 +0000 (02:23 +0000)]
Merge "Make netd track and notify IP address changes."
Lorenzo Colitti [Fri, 25 Oct 2013 10:53:31 +0000 (19:53 +0900)]
Simplify notification code in NetlinkHandler.
1. Factor most of the notification code out to a common function.
2. Use vasprintf instead of snprintf so we don't have to worry
about clipping notifications due to fixed-size message
buffers.
[Cherry-pick of
0b454ea4abdc8a563af6da58fa37835729220acf]
Bug:
9180552
Change-Id: Idde16ee6dd56d38dab866f0ea678b04d98b3048d
Lorenzo Colitti [Thu, 12 Sep 2013 15:56:23 +0000 (00:56 +0900)]
Don't log "Unexpected netlink message" on NDUSEROPT
When opening the netlink socket, NetlinkManager specifies it's
interested in ND_USEROPT messages, but we since we don't have
code to parse them yet, we end up logging an error message for
packets that contain them. Get rid of the logspam by not asking
the kernel to receive them.
[Cherry-pick of
a95f8a3426e6a4f17cf41888673f58302781b7be]
Bug:
10718651
Change-Id: Ib1b7748448a983cfa7bb7725e48e238d85152ea2
Lorenzo Colitti [Mon, 2 Sep 2013 15:26:23 +0000 (00:26 +0900)]
Unbreak interface add/delete notifications.
The change to enable address tracking via netlink incorrectly
changed the subsystem of rtnetlink events from "net" to
"interface". This broke interface add/delete notifications,
which come from the kernel with subsystem "net".
Switch back to "net" and deal with address tracking via new
action codes instead of a new subsystem.
[Cherry-pick of
4da12db25b4a2947b1a98b0322e4be56a30c5e17]
Bug:
10433320
Change-Id: I59a50e9c7cb49f46e680c7d84ac8e196a861ca4b
Lorenzo Colitti [Thu, 1 Aug 2013 20:57:47 +0000 (05:57 +0900)]
Make netd track and notify IP address changes.
Subscribe netd's netlink socket to listen to IPv4 and IPv6
address changes (and ND opts, which we'll need for IPv6 DNS
later), and make NetlinkHandler notify the system of address
changes.
[Cherry-pick of
9b3cd7635caf5948d7d4b11f8f588c9d2811d58e]
Bug:
10232006
Change-Id: Ib9dfd58635dce389980d8ee9529a17661a02320a
Robert Greenwalt [Thu, 1 Aug 2013 15:17:47 +0000 (15:17 +0000)]
Merge "Incorrect memset parameters"
Edward Savage-Jones [Fri, 19 Jul 2013 20:09:44 +0000 (22:09 +0200)]
Incorrect memset parameters
Memset parameters swapped
Change-Id: I528c1f6de344447d3c43d89c1dd4cd87e1c5c5a7
Robert Greenwalt [Thu, 18 Jul 2013 16:08:46 +0000 (09:08 -0700)]
am
08ff0e40: Merge "Fix memset call"
* commit '
08ff0e408976d541dae0fc36527c15195cc86cda':
Fix memset call
Robert Greenwalt [Thu, 18 Jul 2013 16:07:19 +0000 (16:07 +0000)]
Merge "Fix memset call"
Wang Liyong [Thu, 18 Jul 2013 14:37:07 +0000 (16:37 +0200)]
Fix memset call
Parameters was passed in the wrong order.
Change-Id: I1d4d68f1ba729bf54da84cbcb5f631938ac697f2
Nick Kralevich [Thu, 20 Jun 2013 22:07:04 +0000 (15:07 -0700)]
am
4ea5bd05: Merge "Revert "netd: reduce privileges""
* commit '
4ea5bd0540bf3b4b6767815b5c9e41a7146f749c':
Revert "netd: reduce privileges"
Nick Kralevich [Thu, 20 Jun 2013 22:04:07 +0000 (22:04 +0000)]
Merge "Revert "netd: reduce privileges""
Nick Kralevich [Thu, 20 Jun 2013 21:54:15 +0000 (21:54 +0000)]
Revert "netd: reduce privileges"
jpa reports that tethering is broken.
This reverts commit
ab3df62f7b5584af6dee4f5ec069b70dd4f4cee6.
Change-Id: I0736f0fd83ea7cada9fdaee7e8d39123d2a3b5c2
Nick Kralevich [Thu, 20 Jun 2013 19:54:11 +0000 (12:54 -0700)]
am
30583ec3: Merge "netd: reduce privileges"
* commit '
30583ec326fb85f5f2638a6582d6f573fd57b42c':
netd: reduce privileges
Nick Kralevich [Thu, 20 Jun 2013 19:52:42 +0000 (19:52 +0000)]
Merge "netd: reduce privileges"
Nick Kralevich [Thu, 20 Jun 2013 00:20:24 +0000 (17:20 -0700)]
netd: reduce privileges
netd doesn't need full root capabilities. Rather, it only needs
CAP_NET_ADMIN and CAP_NET_RAW. Reduce the capabilities to that
set.
netd continues to run with UID=0, which allows applications spawned
by netd to continue to have CAP_NET_ADMIN and CAP_NET_RAW. It also
allows netd to access /proc and /sys files as UID=0.
Change-Id: I439d22150109697213c0cc83276ddb668007b978
Jeff Johnson [Thu, 11 Apr 2013 22:11:27 +0000 (15:11 -0700)]
Enable 802.11g hardware mode in hostapd.conf
The current hostapd.conf generated by SoftapController does not
contain a hw_mode setting. As a result hostapd defaults to 802.11b
mode. This mode is inconsistent with the setting "ieee80211n=1" and
prevents hostapd from using 802.11g/n rates. Add "hw_mode=g" to the
generated hostapd.conf to allow 802.11g/n rates to be advertised and
used.
Change-Id: Ifd66da3f3ffdfffb7c28e751d20bc432e070b2c3
Lorenzo Colitti [Thu, 11 Apr 2013 15:44:06 +0000 (00:44 +0900)]
Set accept_ra to 2 on all interfaces
Currently, we set accept_ra to 2 (accept RAs even if forwarding
is on) only on wifi and ethernet, but not on other interfaces
like mobile. This breaks IPv6 over mobile on Nexus 7 3G and
all other devices where the IPv6 default route is configured via
RA, because as soon as we start 464xlat (which enables
forwarding) their default route goes away.
Rather than require all manufacturers to update their RILs to
set the flag themselves, set it ourselves at netd startup time.
Bug:
8276725
Change-Id: If066bb1aa3ff211da0a0bbe8d58d5a7f35298580
Ying Wang [Wed, 10 Apr 2013 05:04:55 +0000 (22:04 -0700)]
Add liblog
Bug:
8580410
Change-Id: Icc2632b33153b01c0d9a15245b3f7e8c89b816ec
Robert Greenwalt [Thu, 28 Mar 2013 16:47:17 +0000 (16:47 +0000)]
Merge "Remove Broadcom hack for BT reverse Tether" into jb-mr2-dev
Robert Greenwalt [Sat, 18 Aug 2012 00:13:48 +0000 (17:13 -0700)]
Remove Broadcom hack for BT reverse Tether
Plumb it in through binder calls between the external BT stack and
the BluetoothTetheringDataTracker.
bug:
8445208
Change-Id: Ice7dfb0b50c9481d359aed14a51372878185171c
JP Abgrall [Mon, 18 Mar 2013 20:04:17 +0000 (13:04 -0700)]
TetherController: fix "tether blabla list" commands handling
And "interface list" doesn't accept the extra args anymore.
Bug:
5327568
Change-Id: I3d2cb5d790b74a013edfc10dfe7a544e9e39f0ff
JP Abgrall [Sat, 16 Mar 2013 03:11:56 +0000 (20:11 -0700)]
TetherController: fix "tether interface list" command handling
It still silently accepts the extra argument.
Bug:
5327568
Change-Id: I4ac1bdb0e2d33133b3d5dbe11f6f94d503a28d11
JP Abgrall [Fri, 15 Mar 2013 03:07:17 +0000 (20:07 -0700)]
NAT: Disable FORWARD by default and set postroute before FORWARD.
[Adaptation from https://android-review.googlesource.com/#/c/50223 ]
For NAT table, only the first packet of data flow
hits the rules in this table. If forward is
enabled before postrouting in NAT, packet may be
forwarded without hit rules in NAT table. Phone
will not get responses for such packets because
source IP address is not translated.
How to reproduce:
1) Enable usb tethering;
2) Start ping test on PC;
3) Disable data on Phone;
4) NAT is disabled since data service is lost;
5) Enable data on Phone;
6) Ping can not recover on PC;
7) Capture tcpdump data on phone, source IP
Address is not translated for ICMP packets.
Test result:
Run steps 1-5 in "How to reproduce", Ping session
on PC can be recovered after data is enabled.
CQ00027191
Change-Id: I1c3bcbb3d69eb7e2f61d720fa17086ee0da22fa0
JP Abgrall [Fri, 15 Mar 2013 03:06:20 +0000 (20:06 -0700)]
NatController: refactor some code wrt sequences of commands
This will help when adding/removing commands.
Change-Id: I154fb3d7064acddc3e067d60f225ecab6ea57ddb
Jean-Baptiste Queru [Mon, 11 Mar 2013 20:44:45 +0000 (13:44 -0700)]
am
484bdcab: am
63790dce: am
42b4c508: (-s ours) am
11ff695d: (-s ours) Reconcile with jb-mr1-release - do not merge
* commit '
484bdcab1e7e64c2ad6ee36b9d216dbc94e82608':
Jean-Baptiste Queru [Mon, 11 Mar 2013 20:13:53 +0000 (13:13 -0700)]
am
63790dce: am
42b4c508: (-s ours) am
11ff695d: (-s ours) Reconcile with jb-mr1-release - do not merge
* commit '
63790dce7a791ef575ea80d69776324e15ecf701':
Jean-Baptiste Queru [Mon, 11 Mar 2013 19:47:28 +0000 (12:47 -0700)]
am
42b4c508: (-s ours) am
11ff695d: (-s ours) Reconcile with jb-mr1-release - do not merge
* commit '
42b4c5083b168c6780b95e5c60b49655b049d56f':
Jean-Baptiste Queru [Mon, 11 Mar 2013 19:28:12 +0000 (12:28 -0700)]
am
11ff695d: (-s ours) Reconcile with jb-mr1-release - do not merge
* commit '
11ff695d526735306e1868b596212aac9f3239f4':
Jean-Baptiste Queru [Mon, 11 Mar 2013 19:23:34 +0000 (12:23 -0700)]
Reconcile with jb-mr1-release - do not merge
Lorenzo Colitti [Tue, 5 Mar 2013 01:04:00 +0000 (10:04 +0900)]
Set accept_ra to 2 when enabling IPv6.
The default value of accept_ra causes the kernel to accept
Router Advertisements only if forwarding is off. This causes
problems with clatd, which uses IPv6 forwarding on a tun
interface, and it may cause problems with IPv6 tethering when
we implement it.
Fix this by setting accept_ra to 2, which accepts RAs regardless
of whether forwarding is on.
Bug:
8276725
Change-Id: Ifee0ceaa68ce438a845fa2d7f3b76c60857114a0
Lorenzo Colitti [Mon, 4 Mar 2013 08:58:40 +0000 (17:58 +0900)]
Move IPv6 code to InterfaceController.
Bug:
8276725
Change-Id: Ia04fb64d3660eb08d8b32209bf689c5c5e6dd9ac
Sasha Levitskiy [Sat, 23 Feb 2013 00:07:42 +0000 (16:07 -0800)]
Netd: Remove an obsolete API: interface get[rt]xcounter
Change-Id: I6b113294b46e5988ad606144c3eef3c846ac28d1
Nick Kralevich [Fri, 22 Feb 2013 05:24:30 +0000 (21:24 -0800)]
Don't use client passed PID
Don't assume the client is telling the truth about their PID.
Always take their PID directly from the socket, which is
guaranteed by the kernel to be accurate.
Change-Id: Id3374306fd7043da22065921bd49aced60df32f5
JP Abgrall [Wed, 13 Feb 2013 03:20:13 +0000 (19:20 -0800)]
BandwidthController: fixup insertion pos in costly chain handling
* Long time ago, setting an alert in a costly_<iface> chain required adding
it just before the ACCEPT rule that was at the end.
But since then the ACCEPT rule has been removed.
This would cause the insert to pick the last position no matter what.
Now we just append.
* A naughty app in the penalty box could waste up quota on packets that would
get dropped in the later penalty_box rule.
Now we check the penalty_box before feeding it to the quota.
Change-Id: Id4b6a7c020583f1cccc7dccde34c4b85d0fd9642
JP Abgrall [Thu, 14 Feb 2013 00:30:00 +0000 (16:30 -0800)]
BandwidthController: correctly handle the iptables command exit code
The return code from android_fork_execvp() needed to be massaged because
a status ptr was passed in.
Bug:
8185095
Change-Id: I205884f09b563dd729423a74f22fd5b8c2d59c64
Rom Lemarchand [Thu, 31 Jan 2013 20:41:03 +0000 (12:41 -0800)]
Replace system_nosh call with android_fork_execvp
Replace the system_nosh call with the android_fork_execvp from
liblogwrap.
Change-Id: Idfbc6bcf0bef16d4ee90d6af6bd4b07bc79913bb
Rom Lemarchand [Thu, 24 Jan 2013 23:14:41 +0000 (15:14 -0800)]
Replacing fork_and_execve with liblogwrap call
Using the android_fork_exec call from liblogwrap rather than a
custom fork_and_execve.
Change-Id: If8f9a5442e5e3cfc887010268c360e55e733aef0
JP Abgrall [Thu, 7 Feb 2013 19:17:15 +0000 (19:17 +0000)]
Merge "netd: BandwidthController: Allow tracking loopback interfaces"
Robert Greenwalt [Thu, 7 Feb 2013 19:02:32 +0000 (19:02 +0000)]
Merge "dns cache per interface iteration 2"
Mattias Falk [Tue, 23 Aug 2011 12:21:38 +0000 (14:21 +0200)]
dns cache per interface iteration 2
support for attach/detach a process (pid) to a
dns cache.
lookup associated dns cache based on the pid
handle pid and interface argument for getaddrinfo
and gethostbyaddress
bug:
5465296
Change-Id: I4832c792d22aceabb0481c548003a1fd879c12e4
JP Abgrall [Thu, 7 Feb 2013 02:01:24 +0000 (18:01 -0800)]
netd: BandwidthController: Allow tracking loopback interfaces
In the past, loopback interfaces were of no use for bandwidth/datausage.
We now don't treat loopback interfaces any differently.
This will helps with CTS tests that checking the kernel's qtaguid functionality
and the matching user-space handling.
Change-Id: If307ceebc10f89269d1b051f666ec666e5e38d41
Rom Lemarchand [Thu, 31 Jan 2013 20:31:23 +0000 (20:31 +0000)]
Merge "Replace custom logwrapper implementation with liblogwrap"
Rom Lemarchand [Thu, 24 Jan 2013 18:01:04 +0000 (10:01 -0800)]
Replace custom logwrapper implementation with liblogwrap
Use liblogwrap to provide logwrapper functionality instead of
using netd's own implementation.
Change-Id: I10e69aa95989f77c63b5b36825ee7c77fba48c88
Robert Greenwalt [Sat, 19 Jan 2013 00:39:43 +0000 (00:39 +0000)]
Merge "Revert "dns cache per interface iteration 2""
Robert Greenwalt [Sat, 19 Jan 2013 00:39:26 +0000 (00:39 +0000)]
Revert "dns cache per interface iteration 2"
This reverts commit
1c0a243bc22d69d32b758fd3da09ccc902c26225
Change-Id: I63d563df01b4bdc69a11037b1d72fdb4de5437db
Robert Greenwalt [Thu, 17 Jan 2013 16:15:11 +0000 (16:15 +0000)]
Merge "dns cache per interface iteration 2"
Sasha Levitskiy [Tue, 15 Jan 2013 00:28:54 +0000 (16:28 -0800)]
Removed Throttle Controller as obsolete
Change-Id: I1a3c0e1a8690d0d5a8fb1411c49bc6db52ce5ccb
Robert Greenwalt [Mon, 14 Jan 2013 20:00:37 +0000 (12:00 -0800)]
am
3911886e: am
d67cc366: resolved conflicts for merge of
b40c2385 to jb-mr1.1-dev
* commit '
3911886e854d31058e7d3a6e310e8eafd06c02e0':
Fix a TOCTOU and symlink attack in netd.
Robert Greenwalt [Mon, 14 Jan 2013 19:58:20 +0000 (11:58 -0800)]
am
d67cc366: resolved conflicts for merge of
b40c2385 to jb-mr1.1-dev
* commit '
d67cc366f769a84f56755b12d2c943113ec46f8c':
Fix a TOCTOU and symlink attack in netd.
Robert Greenwalt [Mon, 14 Jan 2013 19:46:38 +0000 (11:46 -0800)]
resolved conflicts for merge of
b40c2385 to jb-mr1.1-dev
Change-Id: I0cef2141487ffd2cb5694a10e4077c299d9d7df7
Robert Greenwalt [Mon, 14 Jan 2013 18:18:55 +0000 (10:18 -0800)]
resolved conflicts for merge of
7b90f090 to jb-mr1-dev
Change-Id: Id5b6598b20f34b5e8d2c90927d2acfae7237e69b
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.
Mattias Falk [Tue, 23 Aug 2011 12:21:38 +0000 (14:21 +0200)]
dns cache per interface iteration 2
support for attach/detach a process (pid) to a
dns cache.
lookup associated dns cache based on the pid
handle pid and interface argument for getaddrinfo
and gethostbyaddress
Change-Id: I325788973ad76beb1ada8f5fa6f52f9a94c08dd1
bug:
5465296
Sasha Levitskiy [Thu, 10 Jan 2013 20:48:39 +0000 (12:48 -0800)]
A rough cleanup of netd/softap
- Added error code propagation
- Added more elaborate error messages
- Added stricter parameter checking in softap fwreload
- Cleaned up class signatures
- Removed a non-working default AP in setSoftap
- Removed obsolete functions:
- int addParam(int pos, const char *cmd, const char *arg);
- int setCommand(char *iface, const char *fname, unsigned buflen=0);
- Removed unused "softap clients" functionality
- Removed unused hostapd communication socket
Change-Id: Iad05069f6547f4b17481991018707d5f9db2500a
Signed-off-by: Alexander Levitskiy <sanek@google.com>
Robert Greenwalt [Tue, 11 Dec 2012 20:33:37 +0000 (12:33 -0800)]
Inform dnsmasq of the downstream ifaces.
This lets it filter the dns requests so we're not a public dns forwarder/spambot.
bug:
7530468
Change-Id: I102fad738aff717e6ac40d4ac5a8d39a6fe2d2ca
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
Robert Greenwalt [Thu, 29 Nov 2012 23:12:32 +0000 (15:12 -0800)]
am
80436522: am
e0644327: Fix a TOCTOU and symlink attack in netd.
* commit '
80436522e8d027ddb31afada47fc2109b8afde8a':
Fix a TOCTOU and symlink attack in netd.
Robert Greenwalt [Thu, 29 Nov 2012 22:28:25 +0000 (14:28 -0800)]
am
e0644327: Fix a TOCTOU and symlink attack in netd.
* commit '
e0644327ffb203e0b45f3192fd888831902e267c':
Fix a TOCTOU and symlink attack in netd.
Robert Greenwalt [Thu, 29 Nov 2012 18:51:33 +0000 (10:51 -0800)]
Fix a TOCTOU and symlink attack in netd.
Bug:
7530471
Change-Id: I01fc79d647831dea903e4b852b874eb7bbed25fb
Robert Greenwalt [Fri, 16 Nov 2012 20:22:13 +0000 (12:22 -0800)]
Merge "Pass dns domain info to resolver."
Robert Greenwalt [Tue, 13 Nov 2012 20:05:14 +0000 (12:05 -0800)]
Pass dns domain info to resolver.
bug:
6799630
Change-Id: I2e1eb75562a7fba005f830ef1350386b9924a8a3
jp abgrall [Wed, 14 Nov 2012 18:52:45 +0000 (10:52 -0800)]
am
ce68e2bf: Merge "Launch android-clat via netd"
* commit '
ce68e2bf2679ca90899d36ada62b78689d256fbe':
Launch android-clat via netd
jp abgrall [Wed, 14 Nov 2012 18:07:25 +0000 (10:07 -0800)]
Merge "Launch android-clat via netd"
JP Abgrall [Wed, 14 Nov 2012 17:58:08 +0000 (09:58 -0800)]
Revert "Launch android-clat via netd"
This reverts commit
72d85556ec238f537de412ac69bbf43342e02d0c.
AOSP has caught up. Original author has prepared an updated version
of this.
Daniel Drown [Wed, 20 Jun 2012 21:51:39 +0000 (16:51 -0500)]
Launch android-clat via netd
This patch adds the commands: "clatd start [interface]", "clatd stop", and
"clatd status"
Change-Id: I4b041d1f13c25108476621d2e2a1e5bac69841f5
Signed-off-by: Daniel Drown <dan-android@drown.org>
Depends-on: If2bc6916fc66fd4bca7cc241c83cfae839b82e15
Daniel Drown [Tue, 13 Nov 2012 23:33:48 +0000 (15:33 -0800)]
Launch android-clat via netd
This patch adds the commands: "clatd start [interface]", "clatd stop", and
"clatd status"
Change-Id: I4b041d1f13c25108476621d2e2a1e5bac69841f5
Signed-off-by: Daniel Drown <dan-android@drown.org>
Depends-on: If2bc6916fc66fd4bca7cc241c83cfae839b82e15
The Android Open Source Project [Tue, 6 Nov 2012 20:34:09 +0000 (12:34 -0800)]
am
f072e3d2: (-s ours) am
a108106e: Reconcile with jb-mr1-factory-release jb-mr1-release - do not merge
* commit '
f072e3d20531ca452a51bd45f863abb23f2e3968':
The Android Open Source Project [Tue, 6 Nov 2012 20:30:08 +0000 (12:30 -0800)]
am
a108106e: Reconcile with jb-mr1-factory-release jb-mr1-release - do not merge
* commit '
a108106eb489a5e2b657d0afc63872334ba0f791':
The Android Open Source Project [Tue, 6 Nov 2012 20:19:24 +0000 (12:19 -0800)]
Reconcile with jb-mr1-factory-release jb-mr1-release - do not merge
Change-Id: I0a50c89812fb0f6e635a02ed4c9db690d749e3cf
The Android Open Source Project [Mon, 24 Sep 2012 17:18:46 +0000 (10:18 -0700)]
am
a3103f9f: (-s ours) Reconcile with jb-mr1-release - do not merge
* commit '
a3103f9fe060e91fd6de0975ebe31ddeed88a9e4':
The Android Open Source Project [Mon, 24 Sep 2012 17:14:03 +0000 (10:14 -0700)]
Reconcile with jb-mr1-release - do not merge
Change-Id: I73a0aeb8cfaf12e12eee1b5d6f9549ef24895f62
The Android Automerger [Fri, 21 Sep 2012 14:00:37 +0000 (07:00 -0700)]
merge in jb-mr1-release history after reset to jb-mr1-dev
Zhihai Xu [Thu, 20 Sep 2012 19:56:44 +0000 (12:56 -0700)]
am
bdb84a1e: am
0b02d05f: remove Pan service which is not used anymore.
* commit '
bdb84a1eb0bbb75648c4761c797fd179a5e1e893':
remove Pan service which is not used anymore.
Zhihai Xu [Thu, 20 Sep 2012 19:51:12 +0000 (12:51 -0700)]
am
0b02d05f: remove Pan service which is not used anymore.
* commit '
0b02d05f1e2968643c42d10841dccedb63d33c48':
remove Pan service which is not used anymore.
Zhihai Xu [Wed, 19 Sep 2012 19:13:10 +0000 (12:13 -0700)]
remove Pan service which is not used anymore.
because we replaced bluez bluetooth stack with bluedroid bluetooth stack.
This is multiple project check-in for ISSUE
6849488 Bluedroid stack, remove system/bluetooth.
Pan service depend on system/bluetooth. So both Pan service and system/bluetooth should be removed.
bug
6849488
Change-Id: I7a5a828b9b4327dbd6b6a13ec7ff4a9129ba0ca5
The Android Open Source Project [Wed, 12 Sep 2012 23:59:15 +0000 (16:59 -0700)]
am
c2203765: (-s ours) Reconcile with jb-mr1-release - do not merge
* commit '
c2203765ea773939cc1a3fe3a77d887c91d0719b':
jp abgrall [Wed, 12 Sep 2012 22:36:03 +0000 (15:36 -0700)]
am
ddf62a13: am
40cdfe48: am
78b00d81: Merge "Don\'t include <linux/...> header files directly."
* commit '
ddf62a13a066039782e4cb67c256b1489c46ed1f':
Don't include <linux/...> header files directly.
Sasha Levitskiy [Wed, 12 Sep 2012 22:14:11 +0000 (15:14 -0700)]
am
e0f6082c: am
87482aa6: Demoting a non-critical error to a warning: unable to load net cmd dll.
* commit '
e0f6082cf6f08c180ee2ef9fa90830068ff40804':
Demoting a non-critical error to a warning: unable to load net cmd dll.
The Android Open Source Project [Wed, 12 Sep 2012 14:42:01 +0000 (07:42 -0700)]
Reconcile with jb-mr1-release - do not merge
Change-Id: I75192a980be37fe14baa5ee2cd5a69452c161b5e
The Android Automerger [Wed, 12 Sep 2012 14:00:34 +0000 (07:00 -0700)]
merge in jb-mr1-release history after reset to jb-mr1-dev
jp abgrall [Wed, 12 Sep 2012 04:13:29 +0000 (21:13 -0700)]
am
40cdfe48: am
78b00d81: Merge "Don\'t include <linux/...> header files directly."
* commit '
40cdfe48dbf95d4cef7bbd47bd0c0e72f72bd390':
Don't include <linux/...> header files directly.
jp abgrall [Wed, 12 Sep 2012 04:11:49 +0000 (21:11 -0700)]
am
78b00d81: Merge "Don\'t include <linux/...> header files directly."
* commit '
78b00d81ebb7e2720fe17c116bcfd086bdd1f4e7':
Don't include <linux/...> header files directly.
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
Sasha Levitskiy [Tue, 11 Sep 2012 18:49:48 +0000 (11:49 -0700)]
am
87482aa6: Demoting a non-critical error to a warning: unable to load net cmd dll.
* commit '
87482aa6d64b835ce8f6485fd5b0953d939ed94f':
Demoting a non-critical error to a warning: unable to load net cmd dll.
Sasha Levitskiy [Tue, 11 Sep 2012 18:04:29 +0000 (11:04 -0700)]
Demoting a non-critical error to a warning: unable to load net cmd dll.
Bug:
7141069
Change-Id: Ib4326f80fd562d845095bad38f45ceb9f3be119e
The Android Automerger [Sun, 9 Sep 2012 14:01:50 +0000 (07:01 -0700)]
merge in jb-mr1-release history after reset to jb-mr1-dev
Jeff Sharkey [Thu, 6 Sep 2012 22:49:57 +0000 (15:49 -0700)]
am
3504ab45: am
bec6d04e: Add LOG_TAG to NetdConstants.
* commit '
3504ab455dba256138da9447fee1d150e18274cc':
Add LOG_TAG to NetdConstants.
Jeff Sharkey [Thu, 6 Sep 2012 22:48:30 +0000 (15:48 -0700)]
am
bec6d04e: Add LOG_TAG to NetdConstants.
* commit '
bec6d04e1a84823b89e5581ea8ebcf9f08915216':
Add LOG_TAG to NetdConstants.
Jeff Sharkey [Thu, 6 Sep 2012 22:45:56 +0000 (15:45 -0700)]
Add LOG_TAG to NetdConstants.
Bug:
7114117
Change-Id: Ifef2cfca6c1361f89ac68eead58df70efc58a8a7
The Android Open Source Project [Tue, 21 Aug 2012 23:09:59 +0000 (16:09 -0700)]
am
eeca586b: (-s ours) Reconcile with jb-mr1-release - do not merge
* commit '
eeca586bda0411d162307e1581e9308f5173592e':
The Android Open Source Project [Tue, 21 Aug 2012 23:07:47 +0000 (16:07 -0700)]
Reconcile with jb-mr1-release - do not merge
Change-Id: Ic385ef16d6d685014334b320ddb7f1929c34bfd3
The Android Automerger [Tue, 21 Aug 2012 13:35:29 +0000 (06:35 -0700)]
merge in jb-mr1-release history after reset to jb-mr1-dev
Jean-Baptiste Queru [Mon, 20 Aug 2012 17:33:59 +0000 (10:33 -0700)]
am
025aecc7: am
6e38211b: am
8a3da263: Merge "Fix race condition in pthread_create()"
* commit '
025aecc7180d09b73220c1218fcc002d00f2d6a2':
Fix race condition in pthread_create()
Jean-Baptiste Queru [Mon, 20 Aug 2012 17:31:49 +0000 (10:31 -0700)]
am
6e38211b: am
8a3da263: Merge "Fix race condition in pthread_create()"
* commit '
6e38211b93d37a599dcab1f24d95e4cdc0cd77f9':
Fix race condition in pthread_create()
Jean-Baptiste Queru [Mon, 20 Aug 2012 17:29:40 +0000 (10:29 -0700)]
am
8a3da263: Merge "Fix race condition in pthread_create()"
* commit '
8a3da263f9fde42efbc54d19465ebd1f83ba35cd':
Fix race condition in pthread_create()