Commit Graph

91947 Commits

Author SHA1 Message Date
Remi NGUYEN VAN
0f78680ce2 Merge "Add global setting to use new DHCPv4 server"
am: 64dda3cf18

Change-Id: I3476e8e53247d086ca38e18c8713bb17396c6dfd
2018-08-28 23:40:02 -07:00
Remi NGUYEN VAN
64dda3cf18 Merge "Add global setting to use new DHCPv4 server" 2018-08-29 06:24:40 +00:00
Remi NGUYEN VAN
dccc1866de Merge "Add DhcpServer"
am: e3a0f42e8e

Change-Id: I4ce2cb61d084b37681e1f5103a4e31d4af1cae3e
2018-08-28 20:32:54 -07:00
Remi NGUYEN VAN
e3a0f42e8e Merge "Add DhcpServer" 2018-08-29 03:19:27 +00:00
Erik Kline
0bd9ac4b69 Merge "Remove ResolveUtil from frameworks/base callers"
am: 0e1621296f

Change-Id: Ibc885ccd9531706df029154f7ec4fde71bf600d1
2018-08-28 20:12:49 -07:00
Treehugger Robot
0e1621296f Merge "Remove ResolveUtil from frameworks/base callers" 2018-08-29 02:58:08 +00:00
Jeff Sharkey
4c9108ca39 Merge "Q."
am: 20cc0ef048

Change-Id: I044403f837d4cfc4d1046357e4286ab95caf9865
2018-08-28 12:31:07 -07:00
Chih-Hung Hsieh
bb6b0f578a Merge "Use multiple patterns and emails in per-file syntax."
am: 7dd3f1dca6

Change-Id: Ie42e3a24b72c7177fe03a7f14bc346e19fa83932
2018-08-28 12:26:32 -07:00
Treehugger Robot
20cc0ef048 Merge "Q." 2018-08-28 18:40:11 +00:00
Treehugger Robot
7dd3f1dca6 Merge "Use multiple patterns and emails in per-file syntax." 2018-08-28 18:28:23 +00:00
Jeff Sharkey
5c877634ae Q.
Clean cherry-pick of ag/4057716.

Bug: 77588754
Test: builds, boots
Change-Id: Ib1d993fe2949f480a350acfa7e2b3cfdc7abd257
Merged-In: Ib1d993fe2949f480a350acfa7e2b3cfdc7abd257
2018-08-28 17:51:35 +00:00
Mathew Inwood
5e99817407 Merge "Add <p> to UnsupportedAppUsage javadoc."
am: dfd7bc77c3

Change-Id: I7e9c71304d072d0883b004760d489637a1ff4b96
2018-08-28 08:54:05 -07:00
Mathew Inwood
48ae9cdf62 Merge "Add myself as OWNERS for UnsupportedAppUsage.java."
am: 0589adc790

Change-Id: I063c30a288ea9da59cfe4a55be3e6d63ee573a1f
2018-08-28 08:50:00 -07:00
Treehugger Robot
dfd7bc77c3 Merge "Add <p> to UnsupportedAppUsage javadoc." 2018-08-28 15:30:29 +00:00
Treehugger Robot
0589adc790 Merge "Add myself as OWNERS for UnsupportedAppUsage.java." 2018-08-28 15:24:23 +00:00
Mathew Inwood
8ea8654bae Add <p> to UnsupportedAppUsage javadoc.
To make HTML rendering of it readable.

Test: m
Change-Id: Ie829b422d6d905f44a909e4a402b61169268e940
2018-08-28 10:52:51 +01:00
Remi NGUYEN VAN
0597453f7c Add global setting to use new DHCPv4 server
The setting applies to the choice of DHCPv4 server for tethering.

Bug: b/109584964
Test: Still builds, SettingsBackupTest passes
Change-Id: Id9b5820883eaf3148f09ad948c34795b3619a30e
2018-08-28 17:47:04 +09:00
Erik Kline
f4fa982339 Remove ResolveUtil from frameworks/base callers
Use the Private DNS bypass logic that was moved into Network.

Once all callers of ResolvUtil are updated to use this interface
ResolvUtil can be deleted.

Test: as follows
    - built, flashed, booted
    - runtest frameworks-net passes
    - connection to captive portal network detects portal correctly
      and the login activity functions as expected

Bug: 64133961
Bug: 72345192
Bug: 73872000
Bug: 78548486

Change-Id: If11ef2b5ffdc729f8449cf18dccd5f1eccbc51e6
2018-08-28 12:59:21 +09:00
Remi NGUYEN VAN
a13007ad0f Add DhcpServer
This first version can serve discover/request/release, although there
are some small behavior changes with current implementation which will
be addressed later.

Also removes final modifiers on start() and stop() in FdEventsReader, to
allow mocking the methods in tests with the current mockito lib.

Test: Added tests pass, manual: flashed a device using the server
Change-Id: I025366ff7d51c4ba31152af50f3dd2b5e280a54d
2018-08-28 12:50:47 +09:00
Makoto Onuki
906a31f49f Merge "Fix OWNERS (change google.com to android.com)"
am: 7a8e363c0b

Change-Id: Ic3e8861a95ac025d1ff6f68943ef460b94d3c501
2018-08-25 23:11:13 -07:00
Makoto Onuki
83c37379da Merge "Actually make OWNERS in sync with the internal version"
am: 7e54042f9c

Change-Id: Id6f2551434279d9d5be0c0cb2c72d59393bd4095
2018-08-24 15:08:00 -07:00
Makoto Onuki
1fda56bbda Fix OWNERS (change google.com to android.com)
Bug: N/A
Test: N/A
Change-Id: I9a9eecfff1a72d7da55be0df73f29985b19c1e38
2018-08-24 14:58:42 -07:00
Makoto Onuki
7e54042f9c Merge "Actually make OWNERS in sync with the internal version" 2018-08-24 21:56:34 +00:00
Chih-hung Hsieh
f16ded6120 Merge "Use multiple patterns and emails in per-file syntax."
am: 62d0edc6ef

Change-Id: I15a2aaf9dd002f1164146d81e8adbbe2bca74231
2018-08-24 12:48:10 -07:00
Makoto Onuki
83c1a68491 Actually make OWNERS in sync with the internal version
Bug: N/A
Test: N/A
Change-Id: Idc1dcc7753a5cf731475ae0f8f01ccd54ac0e3b3
2018-08-24 12:47:20 -07:00
Chih-hung Hsieh
62d0edc6ef Merge "Use multiple patterns and emails in per-file syntax." 2018-08-24 18:52:43 +00:00
Makoto Onuki
92732c2a25 Merge "Update OWNERS for database code"
am: aea74ff62a

Change-Id: I7c5ea848faaf7bc463b8640f9f922c3649a46409
2018-08-24 09:38:49 -07:00
Makoto Onuki
aea74ff62a Merge "Update OWNERS for database code" 2018-08-24 16:20:55 +00:00
Blake Lawson
a42857e3a4 Merge "Fix typo in IpConfiguration comment"
am: 7b7e05459f

Change-Id: Ife540b3bda671dcb8016dae86f221a62063bd464
2018-08-23 21:08:12 -07:00
Treehugger Robot
7b7e05459f Merge "Fix typo in IpConfiguration comment" 2018-08-24 03:43:38 +00:00
Remi NGUYEN VAN
e06ae295a2 Merge changes I2cea553a,Id8d3dcf6,I19e68e88,I35598935,Idd7dc369, ...
am: e01b4ce6c7

Change-Id: I1800eb214d501e76b8705a27ca817000d009736e
2018-08-23 20:33:45 -07:00
Remi NGUYEN VAN
e01b4ce6c7 Merge changes I2cea553a,Id8d3dcf6,I19e68e88,I35598935,Idd7dc369, ...
* changes:
  Add a SharedLog method to log errors w/ stacktrace
  Add DhcpServingParams
  Add fields to DHCP packets for server use-case
  Add util to add an ARP table entry
  Add DHCP utils extracted from DhcpClient
  Add DhcpLeaseRepository
2018-08-24 03:09:55 +00:00
Eric Holk
106905df2e Merge "Add more tracing for obtainStyledAttributes"
am: 2ef6338351

Change-Id: I9f65106687262f180dd62d329c7197cb720def51
2018-08-23 17:35:16 -07:00
Treehugger Robot
2ef6338351 Merge "Add more tracing for obtainStyledAttributes" 2018-08-24 00:11:50 +00:00
Chih-Hung Hsieh
f690aebc09 Use multiple patterns and emails in per-file syntax.
Test: build/make/tools/checkowners.py -c -v OWNERS
Change-Id: I1de13d357c4bcc51fd75d0df6f9bc994dfd17efb
2018-08-23 15:11:24 -07:00
Chih-Hung Hsieh
002a574a7d Use multiple patterns and emails in per-file syntax.
Test: build/make/tools/checkowners.py -c -v OWNERS
Change-Id: Ia3e1df3f5ba8ad29489a017e55890b4dbb23a64d
2018-08-23 14:53:16 -07:00
Blake Lawson
0c9ed965d3 Fix typo in IpConfiguration comment
Bug: NONE
Test: NONE
Change-Id: Ib2ce166532292266da17ec85c16e400afe4f9111
2018-08-23 08:43:07 -07:00
Remi NGUYEN VAN
a420b57a6b Add DhcpServingParams
Those parameters will be used to start DhcpServer or update its
configuration.

Test: runtest DhcpServingParamsTest.java
Bug: b/109584964
Change-Id: Id8d3dcf62d66dcb02accffa8d8500e30f07af452
2018-08-23 17:29:48 +09:00
Mathew Inwood
5404443a55 Add myself as OWNERS for UnsupportedAppUsage.java.
Test: N/A
Change-Id: I8cfe22c504844f7f0cc50c81fe718e49fc6705f6
2018-08-23 09:16:57 +01:00
Remi NGUYEN VAN
12da4a5efc Add util to add an ARP table entry
This is to be used by the new DhcpServer to add ARP entries with new
addresses before sending unicast responses.

Test: manual: cat /proc/net/arp with implementation based on this
Bug: b/109584964
Change-Id: I3559893583aa3c49b188ad689a41ee2f3e9d9bf3
2018-08-23 16:01:44 +09:00
Tyler Gunn
0413689b87 Merge "Update BlockedNumberContract to indicate why a call was blocked."
am: a6d6bf816b

Change-Id: I03fb1c62380f8ae6de250f5cf907d75c6dc5f863
2018-08-22 14:22:22 -07:00
Tyler Gunn
a6d6bf816b Merge "Update BlockedNumberContract to indicate why a call was blocked." 2018-08-22 20:12:04 +00:00
Makoto Onuki
5b3c10cb28 Update OWNERS for database code
Test: N/A

Change-Id: If657f1ac87d9a9e77162816c7ac6abb719b834d4
Merged-in: If657f1ac87d9a9e77162816c7ac6abb719b834d4
2018-08-22 15:43:13 -04:00
Mathew Inwood
06cd1d260b Merge "Add maxTargetSdk to @UnsupportedAppUsage annotation."
am: 29f955559a

Change-Id: I6ec4d051b19faf7302426c2c78ec728c2be75226
2018-08-22 09:10:56 -07:00
Mathew Inwood
29f955559a Merge "Add maxTargetSdk to @UnsupportedAppUsage annotation." 2018-08-22 14:14:25 +00:00
David Brazdil
9582cf7c1b Merge "Greylist requested hidden API"
am: 473654c377

Change-Id: I01c25f8570851fee7f5db6f355de071acc1f095d
2018-08-22 06:08:03 -07:00
Mathew Inwood
37d1e21614 Merge "Remove @UnsupportedAppUsage annotations from generated code."
am: 30ea09ab75

Change-Id: Iecef5e97eb464ab9b609dac79f7b0367aa497837
2018-08-22 06:04:03 -07:00
Mathew Inwood
b6c87140c7 Merge "Add @UnsupportedAppUsage annotations"
am: df82ab2de2

Change-Id: I05a2fa49b9400036f3388709e54f0165737887ee
2018-08-22 05:58:59 -07:00
Cheney Ni
280efb289b Merge "Be the current user to get A2DP proxy"
am: c3824e5d57

Change-Id: I3e6dd95a575c0cccd7343b2b26f1eefd3e465edf
2018-08-22 05:31:21 -07:00
David Brazdil
473654c377 Merge "Greylist requested hidden API" 2018-08-22 09:14:05 +00:00