Commit Graph

5233 Commits

Author SHA1 Message Date
Andreas Gampe
634ef0c74b Merge changes into stage-aosp-master am: 741a4c94ac
am: 09fdf8375e

Change-Id: Ib5bf516476d00ebdf985066480ceaa7499992b42
2018-09-10 16:22:34 -07:00
Andreas Gampe
51ac636877 Merge changes into stage-aosp-master am: 2c825c0278
am: aa15c5aa07

Change-Id: Ifdd9d438255ab122410c8529bbe6e94654d33e64
2018-09-10 16:17:18 -07:00
Andreas Gampe
09fdf8375e Merge changes into stage-aosp-master
am: 741a4c94ac

Change-Id: If60b6361f323c651510900344d75ce5fa7db17c3
2018-09-10 16:01:58 -07:00
Andreas Gampe
aa15c5aa07 Merge changes into stage-aosp-master
am: 2c825c0278

Change-Id: I4e707c0172a858db97d903ad79dadb37c7a910a7
2018-09-10 15:58:08 -07:00
Android Build Merger (Role)
741a4c94ac Merge changes into stage-aosp-master 2018-09-10 22:43:03 +00:00
Android Build Merger (Role)
2c825c0278 Merge changes into stage-aosp-master 2018-09-10 22:43:03 +00:00
Hugo Benichi
e279b7a719 Merge changes Ie28e6c80,I3cb9b2ce am: 078f0ce714 am: 6946b28c1d
am: 22a8d12365

Change-Id: Icc4434b3e2662c7f576eaee141db2fe04c78f786
2018-09-04 23:46:38 -07:00
Hugo Benichi
22a8d12365 Merge changes Ie28e6c80,I3cb9b2ce am: 078f0ce714
am: 6946b28c1d

Change-Id: I550b2dd325dba38513eabb3ae8c94c2787fbbf70
2018-09-04 23:24:07 -07:00
Hugo Benichi
6946b28c1d Merge changes Ie28e6c80,I3cb9b2ce
am: 078f0ce714

Change-Id: I7e910aaed571c3c37fd4a5ba4d5a0eeb5f52c8bd
2018-09-04 23:15:54 -07:00
Hugo Benichi
078f0ce714 Merge changes Ie28e6c80,I3cb9b2ce
* changes:
  ConnectivityService: dumpsys args for dumping networks or requests only.
  ConnectivityService: Sort requests and networks in dumpsys.
2018-09-05 05:54:24 +00:00
Hugo Benichi
5df91ce8be ConnectivityService: dumpsys args for dumping networks or requests only.
This patch adds two arguments to ConnectivityService dumpsys handler so
that only current networks or only current requests are dumped:

- "adb shell dumpsys connectivity networks" will dump current networks.
- "adb shell dumpsys connectivity requests" will dump current requests.

Bug: none
Test: Compiled, flashed, booted, checked that both new dumpsys args work
      as expected.

Change-Id: Ie28e6c800795eb49f386b609e8222a25e73dfc84
2018-09-05 13:04:12 +09:00
Hugo Benichi
a480ba57f5 ConnectivityService: Sort requests and networks in dumpsys.
This patch adds two utility functions for sorting requests and networks
tracked by ConnectivityService by request id and network id
respectively.

These utility functions are then used to improve the output of
adb shell dumpsys connectivity so that networks and requests are
printed in a more stable fashion.

Bug: none
Test: Compiled, flashed, booted, checked output of adb shell
      dumpsys connectivity.

Change-Id: I3cb9b2ceab64145611a416dcb8c5d512838a2626
2018-09-05 13:03:55 +09:00
Paul Hu
401ec5fade Merge "PermissionMonitor: Limit preinstalled apps network permissions" am: cb0e6f589a am: 41b3dd929f
am: 0877d8650c

Change-Id: I631d1a561d23e4adf6d0aa3a4532c621798cdbe6
2018-09-03 02:59:35 -07:00
Paul Hu
0877d8650c Merge "PermissionMonitor: Limit preinstalled apps network permissions" am: cb0e6f589a
am: 41b3dd929f

Change-Id: I1478c932bf612fd4546c4178fc8f4a0bededf127
2018-09-03 02:41:26 -07:00
Paul Hu
41b3dd929f Merge "PermissionMonitor: Limit preinstalled apps network permissions"
am: cb0e6f589a

Change-Id: I173026e41ed11fa5f4c679a5759b55213e21b596
2018-09-03 02:30:12 -07:00
Paul Hu
cb0e6f589a Merge "PermissionMonitor: Limit preinstalled apps network permissions" 2018-09-03 09:16:52 +00:00
paulhu
c7a3a56e57 PermissionMonitor: Limit preinstalled apps network permissions
Not all preinstalled apps should have access to background
networks or restricted networks. But we give them all network
access permissions currently, it's not a good design. So we
shall limit preinstalled apps permissions, they should just
request the appropriate permission for their use case from
the network permissions.

Bug:19610688
Test: runtest frameworks-net
Change-Id: I184ae3197208c979847ca134c8f01b32528badf1
2018-08-29 13:49:33 +08:00
Erik Kline
94ba181e4e Merge "Remove ResolveUtil from frameworks/base callers" am: 0e1621296f am: 89e36d45f7
am: 50160c2f49

Change-Id: Iddadeb5dc0b97180deac407f3196185edd3e0340
2018-08-28 20:31:13 -07:00
Erik Kline
50160c2f49 Merge "Remove ResolveUtil from frameworks/base callers" am: 0e1621296f
am: 89e36d45f7

Change-Id: I3199337fd168f58f13a547d4eaff2be069a22f3d
2018-08-28 20:21:50 -07:00
Erik Kline
89e36d45f7 Merge "Remove ResolveUtil from frameworks/base callers"
am: 0e1621296f

Change-Id: Ibc885ccd9531706df029154f7ec4fde71bf600d1
2018-08-28 20:12:49 -07:00
Erik Kline
767b7f2021 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
Blake Lawson
5c0c76e74b Merge "Fix typo in IpConfiguration comment" am: 43afefcd97 am: c03904e096
am: 22bdadc546

Change-Id: I58b8e7c793d73ea53f11d66bc6f709d0c4f0c5aa
2018-08-23 21:27:11 -07:00
Blake Lawson
22bdadc546 Merge "Fix typo in IpConfiguration comment" am: 43afefcd97
am: c03904e096

Change-Id: I0871973d37267215fc31455015a37e6a8a60d821
2018-08-23 21:17:32 -07:00
Blake Lawson
c03904e096 Merge "Fix typo in IpConfiguration comment"
am: 43afefcd97

Change-Id: Ife540b3bda671dcb8016dae86f221a62063bd464
2018-08-23 21:08:12 -07:00
Remi NGUYEN VAN
69fa140faa Merge changes I2cea553a,Id8d3dcf6,I19e68e88,I35598935,Idd7dc369, ... am: e01b4ce6c7 am: 1f3417b720
am: 8e31d1ab6a

Change-Id: Idc8915a99710a1e2bfd456519fb2931639cd5142
2018-08-23 20:51:03 -07:00
Treehugger Robot
43afefcd97 Merge "Fix typo in IpConfiguration comment" 2018-08-24 03:43:38 +00:00
Remi NGUYEN VAN
8e31d1ab6a Merge changes I2cea553a,Id8d3dcf6,I19e68e88,I35598935,Idd7dc369, ... am: e01b4ce6c7
am: 1f3417b720

Change-Id: If4f9e1b498855af05011cbd0f529e346bebd4cbd
2018-08-23 20:42:23 -07:00
Remi NGUYEN VAN
1f3417b720 Merge changes I2cea553a,Id8d3dcf6,I19e68e88,I35598935,Idd7dc369, ...
am: e01b4ce6c7

Change-Id: I1800eb214d501e76b8705a27ca817000d009736e
2018-08-23 20:33:45 -07:00
Blake Lawson
4253b45cbb Fix typo in IpConfiguration comment
Bug: NONE
Test: NONE
Change-Id: Ib2ce166532292266da17ec85c16e400afe4f9111
2018-08-23 08:43:07 -07:00
Remi NGUYEN VAN
aa3d9ac73b 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
Remi NGUYEN VAN
029434e9ac 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
Remi NGUYEN VAN
beffb48788 [automerger skipped] Merge "Fix testRegisterUsageCallback failure in setUp" am: e358e840ab am: 2f0a74a612
am: 615721f947  -s ours

Change-Id: I6ac57830e6c5669f24d7b2195632f578e2c7fb84
2018-08-17 02:15:34 -07:00
Remi NGUYEN VAN
615721f947 Merge "Fix testRegisterUsageCallback failure in setUp" am: e358e840ab
am: 2f0a74a612

Change-Id: I5723e356d1b6aa1a71ba693598a5796900fd9ddc
2018-08-17 02:02:08 -07:00
Remi NGUYEN VAN
2f0a74a612 Merge "Fix testRegisterUsageCallback failure in setUp"
am: e358e840ab

Change-Id: I516bab9b9b6c5f48845f18d0e2ab8b47f0f809de
2018-08-17 01:48:48 -07:00
Remi NGUYEN VAN
e358e840ab Merge "Fix testRegisterUsageCallback failure in setUp" 2018-08-17 01:51:10 +00:00
Mathew Inwood
e9ee69a79c [automerger skipped] Merge "Add @UnsupportedAppUsage annotations" am: d717c04b12 am: 2d2b826f60
am: e7b927a3d5  -s ours

Change-Id: Ic0cc520e264f50d8425af1a026e109a96d5cd534
2018-08-16 04:09:37 -07:00
Mathew Inwood
e7b927a3d5 Merge "Add @UnsupportedAppUsage annotations" am: d717c04b12
am: 2d2b826f60

Change-Id: I99215dd5430968df2e2dd514d21b396b00c1403e
2018-08-16 03:29:58 -07:00
Mathew Inwood
2d2b826f60 Merge "Add @UnsupportedAppUsage annotations"
am: d717c04b12

Change-Id: I8f8c9106b494caa6dc5ad405111f2a285a01e49f
2018-08-15 10:12:01 -07:00
Mathew Inwood
c5b9bec94e Add @UnsupportedAppUsage annotations
For packages:
  android.net.wimax
  android.net.wifi.p2p.nsd
  android.net.wifi.p2p
  android.net.wifi.hotspot2.pps
  android.net.wifi.hotspot2.omadm
  android.net.wifi.hotspot2
  android.net.wifi.aware
  android.net.wifi
  android.net.util
  android.net.sip
  android.net.rtp
  android.net.nsd
  android.net.metrics
  android.net.lowpan
  android.net.http
  android.net.captiveportal
  android.net

This is an automatically generated CL. See go/UnsupportedAppUsage
for more details.

Exempted-From-Owner-Approval: Mechanical changes to the codebase
which have been approved by Android API council and announced on
android-eng@

Bug: 110868826
Test: m
Change-Id: Ie25423113ee1a8071cd5039382c00de6ce0af7fd
Merged-In: I520be7a4c79e68310c12e4f55bf66acaa94145a1
2018-08-14 14:44:29 +01:00
Mathew Inwood
5857479631 Add @UnsupportedAppUsage annotations
For packages:
  android.net.wimax
  android.net.wifi.p2p.nsd
  android.net.wifi.p2p
  android.net.wifi.hotspot2.pps
  android.net.wifi.hotspot2.omadm
  android.net.wifi.hotspot2
  android.net.wifi.aware
  android.net.wifi
  android.net.util
  android.net.sip
  android.net.rtp
  android.net.nsd
  android.net.metrics
  android.net.lowpan
  android.net.http
  android.net.captiveportal
  android.net

This is an automatically generated CL. See go/UnsupportedAppUsage
for more details.

Exempted-From-Owner-Approval: Mechanical changes to the codebase
which have been approved by Android API council and announced on
android-eng@

Bug: 110868826
Test: m
Change-Id: I520be7a4c79e68310c12e4f55bf66acaa94145a1
2018-08-14 14:39:24 +01:00
Remi NGUYEN VAN
5dd7f07260 Fix testRegisterUsageCallback failure in setUp
LocalServices.addService in NetworkStatsService is currently failing
with IllegalStateException "Overriding service registration". Setting up
LocalServices in the test to avoid this issue might be possible, but
moving the registration to the only non-test caller of that constructor
as done here solves the issue and avoids side-effects from a constructor.

Test: atest FrameworksNetTests does not choke on this test
Bug: b/78487385
Bug: b/80082746
Change-Id: I5dba98fc79aec0800c8b71e6c7e23d1cfbcae852
Merged-In: I884a7a8bd7db3fcd220b785ba9914ac8c77720f0
(Clean cherry-pick of go/ag/4061255)
2018-08-14 18:14:09 +09:00
Xin Li
d92ed6cd0d Merge stage-dr1-aosp-master into stage-aosp-master am: cb7358d2a5
am: b618945a5c

Change-Id: Ie1b8c0ef016a004ad9c6cdadc27db63ae3f4b80e
2018-08-13 18:27:18 -07:00
Xin Li
b618945a5c Merge stage-dr1-aosp-master into stage-aosp-master
am: cb7358d2a5

Change-Id: I435e644305d986d3d359f7e97086637d00c50b6c
2018-08-13 17:21:33 -07:00
Roshan Pius
bc69bfe7dd Merge "NetworkAgent: Send primitive integer in explicitlySelected" am: bc63072e52 am: 50a9fc9189
am: e9c6857122

Change-Id: If8ebb61aa2e11516932977457fde64eca35046b5
2018-08-13 15:50:38 -07:00
Roshan Pius
e9c6857122 Merge "NetworkAgent: Send primitive integer in explicitlySelected" am: bc63072e52
am: 50a9fc9189

Change-Id: I5c00ed2031433b1176e41a1c01fd80b90fe0d27c
2018-08-13 15:37:07 -07:00
Xin Li
cb7358d2a5 Merge stage-dr1-aosp-master into stage-aosp-master
Bug: 112535855
Change-Id: I1ba00379ca307f44a6430e516b474983e4c1dd32
2018-08-13 13:01:08 -07:00
Treehugger Robot
bc63072e52 Merge "NetworkAgent: Send primitive integer in explicitlySelected" 2018-08-13 17:09:51 +00:00
Roshan Pius
9a513ff213 Merge "NetworkAgent: Send primitive integer in score" am: 45190f8e7f am: c039ad203e am: d1900ecd7d
am: 856ff38b52

Change-Id: I31c885ca25afe6724f7549bba2cd3ae99b1477af
2018-08-10 09:39:49 -07:00
Roshan Pius
856ff38b52 Merge "NetworkAgent: Send primitive integer in score" am: 45190f8e7f am: c039ad203e
am: d1900ecd7d

Change-Id: I8ca588bfcee7488c05ff33a2f85beb6aa2299776
2018-08-10 09:17:51 -07:00
Roshan Pius
d1900ecd7d Merge "NetworkAgent: Send primitive integer in score" am: 45190f8e7f
am: c039ad203e

Change-Id: I7f6ac7a5fd6ecae4ac077b7f54fe91879a63fa13
2018-08-10 08:54:21 -07:00