GitLab

am: 569ec058

* commit '569ec058':
  Track rename from base/ to android-base/.

am: c4f60ec9

* commit 'c4f60ec9':
  Track rename from base/ to android-base/.

Change-Id: Ice6d43c0f9b16b8fb441158a0f7344dfbf969dea

Bug: 9580643
Change-Id: Id086ff9194097fc1e0ab8e2e58e6ff843303f051

Don\'t use framework permission strings for netd permissions. am: 5c8c42e9 am: 3b61825a am: a8c46019 am: 296f2ef5
am: b338d7c7

* commit 'b338d7c7':
  Don't use framework permission strings for netd permissions.

Don\'t use framework permission strings for netd permissions. am: 5c8c42e9 am: 3b61825a am: a8c46019
am: 296f2ef5

* commit '296f2ef5':
  Don't use framework permission strings for netd permissions.

am: a8c46019

* commit 'a8c46019':
  Don't use framework permission strings for netd permissions.

am: 3b61825a

* commit '3b61825a':
  Don't use framework permission strings for netd permissions.

am: 5c8c42e9

* commit '5c8c42e9':
  Don't use framework permission strings for netd permissions.

These framework permission strings were being used as arbitrary labels
that mapped to netd permissions that have completely different meaning.
This leads to confusion, so use different strings.

This is being cherry picked from lmp-mr1-dev to lmp-dev to fix failures
when creating restricted networks due to prior back-port a120442.

Bug: 21900139
Bug: 18194858
Change-Id: Ib3ec377ab26ce904d3d4678f04edec6cb1260517
(cherry picked from commit 584dbee5)

Additionally, store and return a list of strings for
DNS forwarders, since that's what is most useful. These
strings are guaranteed to be valid IP string literals by
virtue of validation on input.

Bug: 9580643
Change-Id: I4fbaf19835055b12e38d585c0bfba0d2b18b9717

Heretofore netd issued commands to dnsmasq over a stdin channel
using ":" as an argument separator. This make it very complicated
to issue commands that involve IPv6 addresses.

This changes the separator from ":" to "|".

Additionally:

    - Pass DHCP range string literals through to startTethering(),
      still performing string literal to IPv4 address validation.

Bug: 9580643
Change-Id: I210daf311a4c3d84dae3ed054b92c9fa399a791f

am: b407c9b3

* commit 'b407c9b3':
  system/netd: check return value of PKCS5_PBKDF2_HMAC_SHA1.

The function PKCS5_PBKDF2_HMAC_SHA1 can fail for a number of reasons and
thus its return value should be checked and handled.

Change-Id: I63bd1378e78926372309072c3fa821666cac1b01

am: 8a55a1b0

* commit '8a55a1b0':
  netd: Add NOTICE and MODULE_LICENSE_* files

am: 04c820c5

* commit '04c820c5':
  netd: Add NOTICE and MODULE_LICENSE_* files

BUG: 24605215
Change-Id: Ice2df1dcaca7af089e6228c4bbf5b5b285b51622

This adds a jump to bw_costly_<ifname> for traffic forwarded out
interface <ifname> to the bw_FORWARD chain, regardless of tethering
state (as having it safely in place is harmless).

Bug: 24497044
Change-Id: I165724c319051ddf29a2833912eb286368b0570d

* commit '4485c500':
  Don't break IPv6 connectivity when in doze mode.

* commit 'c8683d7e':
  Don't break IPv6 connectivity when in doze mode.

Working IPv6 connectivity relies on the kernel being able to
receive certain ICMPv6 packets (router advertisements, neighbour
solicitations, neighbour advertisements) at all times. Allow
these packets when in doze mode.

This is not necessary for IPv4 because in IPv4 these functions
use ARP, which is invisible to iptables.

Bug: 23158230
Change-Id: I29ed77561db9688486cf58cd14ac3bce7fce4b40

* commit '88d94fd9':

am 916188db: am 56cc45f1: (-s ours) am f2fed764: Make iptables -L and -S calls wait for xtables lock

* commit '916188db':

am d9c0c36a: am c132be49: (-s ours) am 93e6f6a7: Merge "Make iptables -L and -S calls wait for xtables lock"

* commit 'd9c0c36a':

* commit 'f228899a':

* commit '56cc45f1':

* commit 'c132be49':

* commit '4e9e23c5':
  bundle init.rc contents with its service

* commit '8246d45e':
  bundle init.rc contents with its service

* commit '8246d45e':
  bundle init.rc contents with its service

* commit 'fc794e75':
  Make iptables -L and -S calls wait for xtables lock

* commit 'f2fed764':
  Make iptables -L and -S calls wait for xtables lock

* commit 'f2fed764':
  Make iptables -L and -S calls wait for xtables lock

* commit '93e6f6a7':
  Make iptables -L and -S calls wait for xtables lock

Bug: 23186545
Change-Id: Iab00111d55494def6009c7b6c0da56ecd4b6aa9f

(cherry picked from commit 99b40503)

Bug:22802665
Change-Id: Ief59212ab976af940887508fab706b5be07005c6