joy/android_packages_modules_Connectivity
Watch
1
Fork
You've already forked android_packages_modules_Connectivity
 0
Code Issues Pull requests Projects Releases Wiki Activity
5,539 commits 1 branch 0 tags 204 MiB
Commit graph

5,539 commits

This branch
This branch
All branches
Message SHA1
Merge "Support backward compatibility for restricted network permission" am: 3e8de1cade am: 5d443532b6 
am: f30eb2c1ee

Change-Id: Icdf485f714e05fa8500ea785230444fbeac98cc5

Paul Hu   authored and   android-build-merger   commited 2018-11-01 01:13:32 -07:00
ade0ea01c9
Merge "Support backward compatibility for restricted network permission" am: 3e8de1cade 
am: 5d443532b6

Change-Id: I9b2faf60ff007e2cc08dacd6988fe98377468e7e

Paul Hu   authored and   android-build-merger   commited 2018-11-01 00:46:15 -07:00
f30eb2c1ee
Merge "Support backward compatibility for restricted network permission" 
am: 3e8de1cade

Change-Id: I15ef9c6efd40e8fe9bb9ff6ae98cae556dc0f8fd

Paul Hu   authored and   android-build-merger   commited 2018-11-01 00:33:39 -07:00
5d443532b6
Merge "Support backward compatibility for restricted network permission"
Paul Hu   authored and   Gerrit Code Review   commited 2018-11-01 07:20:05 +00:00
3e8de1cade
Support backward compatibility for restricted network permission 
Some native daemons legacy design work with SYSTEM_UID. If none of
SYSTEM_UID apps declare the restricted network permission, it will
result in permission denial in daemons. Allow SYSTEM_UID in the
devices shipped before Q to support backward compatibility.

Bug:114245686
Test: 1. runtest frameworks-net
      2. atest FrameworksNetTests
      3. Native daemons with SYSTEM_UID can work normally

Change-Id: I6f3f0d83bcae74ef5389535b528af3baf649fa48

paulhu   commited 2018-11-01 10:38:11 +08:00
8e38c05bb3
Merge "Fix negative uid stats caused by 464xlat adjust when eBPF is on." am: 0d63da86e2 am: 8711dff1be 
am: 9f56f04cf9

Change-Id: I9d0d8b67ed0159ba2a71059620ebe5698eb79ccb

Junyu Lai   authored and   android-build-merger   commited 2018-10-30 19:56:01 -07:00
d71b5643bb
Merge "Fix negative uid stats caused by 464xlat adjust when eBPF is on." am: 0d63da86e2 
am: 8711dff1be

Change-Id: I3ee791e4b6fdd9d508807810183dc02c69bd2c0b

Junyu Lai   authored and   android-build-merger   commited 2018-10-30 19:46:18 -07:00
9f56f04cf9
Merge "Fix negative uid stats caused by 464xlat adjust when eBPF is on." 
am: 0d63da86e2

Change-Id: Ia5120619ce7d5cedd6e558ed4d1dc9a706638796

Junyu Lai   authored and   android-build-merger   commited 2018-10-30 19:35:32 -07:00
8711dff1be
Fix negative uid stats caused by 464xlat adjust when eBPF is on. 
When using xt_qtaguid to count per uid stats,
NetworkStatsService needs to adjust the 464xlat traffic since
iptables module would double count for ipv4 and ipv6 packet.
But for eBPF, the per uid stats is collected in a different
hook, so the adjustment on root uid would only be needed in tx
direction.

Bug: 112226716
Test: 1. Make ipv4 traffic in ipv6-only network and check data
         usage.
      2. Make ipv4 traffic in a client which connect to
         ipv6-only hotspot.
      3. runtest frameworks-net
      4. cts-tradefed run cts -m CtsNetTestCases -t \
                 android.net.cts.TrafficStatsTest
      5. cts-tradefed run cts -m CtsUsageStatsTestCases

Change-Id: Ic9a84f5446eddc943c255d5f3b89dad171f53cac

junyulai   commited 2018-10-30 21:23:38 +08:00
1d103a9809
Merge "Refactor UidRange by using stable aidl structure" am: 1742c23b88 am: 55c7b00f65 
am: 7f47d94a18

Change-Id: I82e06fe93a3ed88368b649ef8d3283322191ffe7

Luke Huang   authored and   android-build-merger   commited 2018-10-28 18:06:15 -07:00
301f969054
Merge "Refactor UidRange by using stable aidl structure" am: 1742c23b88 
am: 55c7b00f65

Change-Id: I09ac7fc6525948b76114ef936dc1b3d2d1bae0fb

Luke Huang   authored and   android-build-merger   commited 2018-10-28 17:55:57 -07:00
7f47d94a18
Merge "Refactor UidRange by using stable aidl structure" 
am: 1742c23b88

Change-Id: I9ac52f3869fe051d0ef7f45768f1defad155b53b

Luke Huang   authored and   android-build-merger   commited 2018-10-28 17:44:20 -07:00
55c7b00f65
Merge "Refactor UidRange by using stable aidl structure"
Treehugger Robot   authored and   Gerrit Code Review   commited 2018-10-29 00:17:34 +00:00
1742c23b88
Merge "ConnectivityService: make log configurable" am: 3ec9281fa8 am: a7a96dd623 
am: 521d6296e2

Change-Id: Iaa8804ce9721bd47a6a26ca1d87d6d69793ba9c8

Chalard Jean   authored and   android-build-merger   commited 2018-10-25 23:41:34 -07:00
26ccd359cb
Merge "ConnectivityService: make log configurable" am: 3ec9281fa8 
am: a7a96dd623

Change-Id: I70557edd9750549d91f58f1ca1e841055c69fabc

Chalard Jean   authored and   android-build-merger   commited 2018-10-25 23:32:06 -07:00
521d6296e2
Merge "No-op refactoring of VPN lockdown status check." am: f694edec6f am: 436343f70d 
am: 7f3b6720c0

Change-Id: I3fb09861c6e6d4c6db2a4105b464018d0b1d8224

Junyu Lai   authored and   android-build-merger   commited 2018-10-25 23:28:21 -07:00
a4f16d8140
Merge "ConnectivityService: make log configurable" 
am: 3ec9281fa8

Change-Id: I5991e26198aa5d5ad809e2585984cb643889a9d1

Chalard Jean   authored and   android-build-merger   commited 2018-10-25 23:22:48 -07:00
a7a96dd623
Merge "ConnectivityService: make log configurable"
Chalard Jean   authored and   Gerrit Code Review   commited 2018-10-26 06:06:19 +00:00
3ec9281fa8
Merge "No-op refactoring of VPN lockdown status check." am: f694edec6f 
am: 436343f70d

Change-Id: I4e5609af2b23b333908732a1a12cb6e97815edcc

Junyu Lai   authored and   android-build-merger   commited 2018-10-25 22:59:57 -07:00
7f3b6720c0
[automerger skipped] Merge changes into pi-dev-plus-aosp 
am: ae3f1ec7d0  -s ours

Change-Id: Id2d191ae22884f4380c087ec2aebe7bbbe180e5c

Xiangyu/Malcolm Chen   authored and   android-build-merger   commited 2018-10-25 22:52:45 -07:00
80981f9b08
Merge "No-op refactoring of VPN lockdown status check." 
am: f694edec6f

Change-Id: I8aab0dd1556b49cafc08d57a8981051ba437fe44

Junyu Lai   authored and   android-build-merger   commited 2018-10-25 22:50:34 -07:00
436343f70d
Merge "No-op refactoring of VPN lockdown status check."
Junyu Lai   authored and   Gerrit Code Review   commited 2018-10-26 05:35:28 +00:00
f694edec6f
Merge "Add more debug log when onBlockedStatusChanged was called." am: 88c8503390 am: 15a1448db3 
am: 614be6b9cc

Change-Id: I286f5b57ca95234e916da6adb6ceedbd1584107e

Junyu Lai   authored and   android-build-merger   commited 2018-10-25 21:53:18 -07:00
72cc5380da
[automerger skipped] Merge pie-platform-release to aosp-master - DO NOT MERGE am: 78ab033fd4 -s ours am: 4ba3e811cc -s ours 
am: ab2485446f  -s ours

Change-Id: I75b649236c9bc42d627dd79d055e38b26e20fa40

Bill Yi   authored and   android-build-merger   commited 2018-10-25 21:14:17 -07:00
871b37ed4d
[automerger skipped] Merge pi-platform-release to stage-aosp-master - DO NOT MERGE am: 3521abfe19 -s ours 
am: 2aeed565f7  -s ours

Change-Id: Ibe80ad8a60c74e954623c543607573491754cd2e

Bill Yi   authored and   android-build-merger   commited 2018-10-25 20:12:57 -07:00
a93d045e91
Merge "To support skip464xlat per Network" am: 698b80818c am: e826aa52e4 
am: 426e1cca1a

Change-Id: I4a6d7480e2e7e775e511cc7eaaabe65b6a3bde7d

Chalard Jean   authored and   android-build-merger   commited 2018-10-25 20:09:15 -07:00
8177c3fc86
Merge changes into pi-dev-plus-aosp
Android Build Merger (Role)   authored and   Android (Google) Code Review   commited 2018-10-26 02:59:16 +00:00
ae3f1ec7d0
[automerger skipped] Merge "Move some members to the "Q blacklist"." am: 26f91069c1 am: 13c9e7e2f3 
am: b265835d23  -s ours

Change-Id: I56c4b05166a7299da177e4a0f98a7aa2003d7dc6

Nathan Harold   authored and   android-build-merger   commited 2018-10-25 19:02:07 -07:00
9b1c74b043
Merge "Add more debug log when onBlockedStatusChanged was called." am: 88c8503390 
am: 15a1448db3

Change-Id: I67665df7729ae7d490fb3f8b41484df6012f257d

Junyu Lai   authored and   android-build-merger   commited 2018-10-25 02:45:21 -07:00
614be6b9cc
Merge "Add more debug log when onBlockedStatusChanged was called." 
am: 88c8503390

Change-Id: I6f5e1af022e43e954b019894a5efb4e6cf8d4846

Junyu Lai   authored and   android-build-merger   commited 2018-10-25 02:35:52 -07:00
15a1448db3
Merge "Add more debug log when onBlockedStatusChanged was called."
Junyu Lai   authored and   Gerrit Code Review   commited 2018-10-25 08:57:56 +00:00
88c8503390
No-op refactoring of VPN lockdown status check. 
Currently, if VPN lockdown is disabled, the blocking judgement
inside VPN will return false immediately. It will make
ConnectivityService hard to check blocked status by a given
VPN lockdown status.

Thus, move this check into ConnectivityService and check it
externally.

Bug: 117814902
Test: 1. manual test with 3rd-party vpn app
      2. runtest frameworks-net

Change-Id: Ia8319b1a1a12f1058c24badf2431f2ec69bc78e7

junyulai   commited 2018-10-25 16:43:50 +08:00
e06923946c
Add more debug log when onBlockedStatusChanged was called. 
Bug: 118355916
Test: 1. runtest frameworks-net
      2. enable/disable battery saver

Change-Id: I6d5f9b49be0defd531fc7ea824668bec7863c4b7

junyulai   commited 2018-10-25 15:20:01 +08:00
29e8abebca
[automerger skipped] Merge pie-platform-release to aosp-master - DO NOT MERGE am: 78ab033fd4 -s ours 
am: 4ba3e811cc  -s ours

Change-Id: If860aa9619b4655886dfdac1528940e5e30446fe

Bill Yi   authored and   android-build-merger   commited 2018-10-24 19:40:40 -07:00
ab2485446f
[automerger skipped] Merge pi-platform-release to stage-aosp-master - DO NOT MERGE 
am: 3521abfe19  -s ours

Change-Id: If3b4a8fabee7b9b74e345d59505040e45588f9e7

Bill Yi   authored and   android-build-merger   commited 2018-10-24 17:20:17 -07:00
2aeed565f7
Merge "To support skip464xlat per Network" am: 698b80818c 
am: e826aa52e4

Change-Id: I944738258051525b371bd17dd3ee7b411b82d12b

Chalard Jean   authored and   android-build-merger   commited 2018-10-24 17:19:51 -07:00
426e1cca1a
[automerger skipped] Merge pie-platform-release to aosp-master - DO NOT MERGE 
am: 78ab033fd4  -s ours

Change-Id: I2c4b9184789a1bdae2cec06e0e72f6c6ca049113

Bill Yi   authored and   android-build-merger   commited 2018-10-24 17:17:46 -07:00
4ba3e811cc
Merge "Move some members to the "Q blacklist"." am: 26f91069c1 
am: 13c9e7e2f3

Change-Id: Ia2419cce28d26d9464da2a5172cb332b629e943e

Nathan Harold   authored and   android-build-merger   commited 2018-10-24 16:14:06 -07:00
b265835d23
Merge pie-platform-release to aosp-master - DO NOT MERGE 
Change-Id: I695db52f5e22509401258e8b083e7650d401d993

Bill Yi   commited 2018-10-24 14:48:44 -07:00
78ab033fd4
Merge pi-platform-release to stage-aosp-master - DO NOT MERGE 
Change-Id: I13571b072111900d0979f026670e648cdef9899b

Bill Yi   commited 2018-10-24 09:08:38 -07:00
3521abfe19
Refactor UidRange by using stable aidl structure 
Use stable aidl generated structure instead of UidRange

Test: runtest frameworks-net passes
Test: manual testing of UidRange related function works
Change-Id: Iaf1c10777dc1e71df2be2a57533a10257b12626b

Luke Huang   commited 2018-10-24 19:45:09 +09:00
477db5fe1a
Merge "To support skip464xlat per Network"
Chalard Jean   authored and   Gerrit Code Review   commited 2018-10-24 07:15:20 +00:00
698b80818c
Merge "Move some members to the "Q blacklist"."
Nathan Harold   authored and   Gerrit Code Review   commited 2018-10-23 21:53:51 +00:00
26f91069c1
Move some members to the "Q blacklist". 
Based on some analysis, these fields/methods are likely false positives.
Set maxTargetSdk=P so that any apps using them are required to migrate off
them in future. See the bug for more details.

Exempted-From-Owner-Approval: Automatic changes to the codebase
affecting only @UnsupportedAppUsage annotations, themselves added
without requiring owners approval earlier.

Bug: 115609023
Test: m
Merged-In: I719b5c94e5b1f4fa562dd5d655953422958ad37e
Change-Id: I719b5c94e5b1f4fa562dd5d655953422958ad37e
(cherry picked from commit 2622bdf569)

Mathew Inwood   authored and   Nathan Harold   commited 2018-10-22 17:28:24 -07:00
0e71d36c58
ConnectivityService: make log configurable 
Make log of ConnectivityService configurable by system property.

Two levels:
VERBOSE: whole VDBG log.
DEBUG: selected necessary log for debug purpose.

Relevant log can be enbled in either way:
1. use adb command at run time.
2. config init.xx.rc file at compile time by adding.
on boot && property:ro.build.type=userdebug
    setprop log.tag.ConnectivityService DEBUG

Bug: 117632924
Change-Id: I43cc84878c64c5b448853c7393393a02262afd15

hiroaki.yokoyama   authored and   Fen Wang   commited 2018-10-22 15:59:17 +09:00
a1a397d1d1
Merge "Add tests for the network blocked status change" am: bbc0585a03 am: e302f75920 
am: 74cb9f8b81

Change-Id: I0e3367d9641717676653bd54ca41d85422c5d81c

Junyu Lai   authored and   android-build-merger   commited 2018-10-19 09:54:18 -07:00
f91c16b27d
Merge "Add new callback to inform blocking of network on specific uid." am: f41deeb4a9 am: 118cf0e236 
am: b4e045b1b8

Change-Id: I2bec503c5ffac156b679a48c09591458ab716789

Junyu Lai   authored and   android-build-merger   commited 2018-10-19 09:47:40 -07:00
304c26b590
Merge "Add tests for the network blocked status change" am: bbc0585a03 
am: e302f75920

Change-Id: Id21571854cd43b724cee170ea458c9f20919c4e6

Junyu Lai   authored and   android-build-merger   commited 2018-10-19 09:31:38 -07:00
74cb9f8b81
Merge "Add new callback to inform blocking of network on specific uid." am: f41deeb4a9 
am: 118cf0e236

Change-Id: I24b45f860992626968a6adfb0ff6b6389c85cf45

Junyu Lai   authored and   android-build-merger   commited 2018-10-19 09:26:39 -07:00
b4e045b1b8
Merge "Add tests for the network blocked status change" 
am: bbc0585a03

Change-Id: I0f3f93807d9089239f572c487d791acd7a324a2e

Junyu Lai   authored and   android-build-merger   commited 2018-10-19 09:18:38 -07:00
e302f75920