Commit Graph

7856 Commits

Author SHA1 Message Date
Chalard Jean
12ed34c77a Merge "Give apps access to the NAT64 prefix." am: d6d1874f83 am: 72a0f88e74
am: 9038bc9908

Change-Id: I759e5da8648fd10b26aa235410ee6e22e1976a9b
2019-12-01 18:33:11 -08:00
Chalard Jean
9038bc9908 Merge "Give apps access to the NAT64 prefix." am: d6d1874f83
am: 72a0f88e74

Change-Id: I251c5ac17fb728d6f0fe91fd96c115c8b8d1879c
2019-12-01 18:27:36 -08:00
Chalard Jean
72a0f88e74 Merge "Give apps access to the NAT64 prefix."
am: d6d1874f83

Change-Id: I673a44f3f75a2395ae3d9d436c83708f20f414e6
2019-12-01 18:20:00 -08:00
Treehugger Robot
d6d1874f83 Merge "Give apps access to the NAT64 prefix." 2019-12-02 02:05:16 +00:00
Mark Chien
481afae6af [automerger skipped] Merge changes from topic "tether_migrate" am: 254a71dd7b am: 29e7ec4550
am: 5515d06c39 -s ours
am skip reason: change_id I4ed08d20f8b7476b8ecd5d018b75806dd2f22cc1 with SHA1 1ddfba4a60 is in history

Change-Id: I630b00c69238730fe5aa267a658f93edb236acc6
2019-11-30 04:36:38 -08:00
markchien
287bd7ffbc [automerger skipped] [Tether07] Migrate Tethering into module am: 497a062e04 am: 7444958737
am: 6d49c339e8 -s ours
am skip reason: change_id I7e78c0e0a3e70f940a749ba2a39ece7c7ec5b9b3 with SHA1 0eda8558ae is in history

Change-Id: Ie6a28a142e2cf75adfc3d1a45d87e9daa67423e4
2019-11-30 04:36:30 -08:00
Mark Chien
5515d06c39 Merge changes from topic "tether_migrate" am: 254a71dd7b
am: 29e7ec4550

Change-Id: Ice864e02b2ef9da73f5a69e0668b6856e718988f
2019-11-30 04:31:35 -08:00
markchien
6d49c339e8 [Tether07] Migrate Tethering into module am: 497a062e04
am: 7444958737

Change-Id: I6e71b418b7303d37144532ab056c21ccbefcb554
2019-11-30 04:31:28 -08:00
Mark Chien
29e7ec4550 Merge changes from topic "tether_migrate"
am: 254a71dd7b

Change-Id: I03e43b7a112f91637941e5193bd21b3e714f5dac
2019-11-30 04:26:07 -08:00
markchien
7444958737 [Tether07] Migrate Tethering into module
am: 497a062e04

Change-Id: I1aaa034e91eae2d6e9abcbbd70741a54a18b3ddc
2019-11-30 04:25:57 -08:00
Mark Chien
254a71dd7b Merge changes from topic "tether_migrate"
* changes:
  [Tether10]Remove UserManagerInternal usage in Tethering
  [Tether07] Migrate Tethering into module
  [Tether07] Clean up build rule for libtetheroffloadjni
2019-11-30 12:17:47 +00:00
Chalard Jean
6491fb772c Give apps access to the NAT64 prefix.
Apps that do their own DNS queries need to know the NAT64 prefix
to resolve v4 addresses on v6-only networks.

Test: FrameworksNetTests NetworkStackTests
Bug: 144877069
Change-Id: I5a255b7afc2038646b93a0ab893f8ad62d0fb34f
2019-11-30 10:25:02 +00:00
markchien
497a062e04 [Tether07] Migrate Tethering into module
Now tethering would be run in dedicated service.
TetheringManager is the interface used to communicate with
TetheringService. The new call flow would be: ConnectivityManager
-> ConnectivityService -> TetheringManager -> TetheringService.
Note: the return value of #tether(), #untether() and #setUsbTethering()
APIs would always be no error. Client can use #getLastTetherError()
or #getTetheredIfaces or listen tether state change to check
status of corresponding interface.

Bug: 136040414
Bug: 144742179
Test: -build, flash, boot
      -atest TetheringTests
      -atest FrameworksNetTests

Change-Id: I7e78c0e0a3e70f940a749ba2a39ece7c7ec5b9b3
Merged-In: I7e78c0e0a3e70f940a749ba2a39ece7c7ec5b9b3
2019-11-30 10:03:08 +00:00
TreeHugger Robot
3d6ef9f0d3 Merge changes from topic "tethering-migrate"
* changes:
  [Tether10]Remove UserManagerInternal usage in Tethering
  [Tether07] Migrate Tethering into module
  [Tether07] Clean up build rule for libtetheroffloadjni
2019-11-29 17:05:14 +00:00
markchien
0eda8558ae [Tether07] Migrate Tethering into module
Now tethering would be run in dedicated service.
TetheringManager is the interface used to communicate with
TetheringService. The new call flow would be: ConnectivityManager
-> ConnectivityService -> TetheringManager -> TetheringService.
Note: the return value of #tether(), #untether() and #setUsbTethering()
APIs would always be no error. Client can use #getLastTetherError()
or #getTetheredIfaces or listen tether state change to check
status of corresponding interface.

Bug: 136040414
Bug: 144742179
Test: -build, flash, boot
      -atest TetheringTests
      -atest FrameworksNetTests

Change-Id: I7e78c0e0a3e70f940a749ba2a39ece7c7ec5b9b3
2019-11-29 07:05:21 +00:00
Aaron Huang
8801199e83 Merge "Add IpConfiguration parcelable interface implementation to system API" am: 9ff42e83d1 am: db770e3ed4
am: 54861e8164

Change-Id: I9add4992fbacca4668867abc7a218256805d1bfc
2019-11-28 02:19:08 -08:00
Aaron Huang
54861e8164 Merge "Add IpConfiguration parcelable interface implementation to system API" am: 9ff42e83d1
am: db770e3ed4

Change-Id: Ic5b8e360cb33cdd18f32a4d2c17beb996584ebda
2019-11-28 02:14:56 -08:00
Aaron Huang
db770e3ed4 Merge "Add IpConfiguration parcelable interface implementation to system API"
am: 9ff42e83d1

Change-Id: I3ead12ee9162c16f8f5937cfc74f38071cef41c9
2019-11-28 02:09:43 -08:00
Aaron Huang
9ff42e83d1 Merge "Add IpConfiguration parcelable interface implementation to system API" 2019-11-28 09:56:58 +00:00
Aaron Huang
1841dc26d5 Add IpConfiguration parcelable interface implementation to system API
API lint robot warnings that parcelable requires writeToParcel
and describeContents.

Bug: 139268426
Bug: 135998869
Test: atest android.net.cts
      atest android.net.wifi.cts
      atest FrameworksNetTests
      ./frameworks/opt/net/wifi/tests/wifitests/runtests.sh

Change-Id: I7acf000c468788c3fdcb47f8601762e7804ab940
2019-11-28 07:25:40 +00:00
Hugo Benichi
97e58950a8 Merge "BitUtils: support packing/unpacking negative long values" am: d5930606d1 am: 12ebdfdc5a
am: 33dd2dc700

Change-Id: Iaa8c4084f0754781ea3e6a0a9202d9e102d5f074
2019-11-27 07:58:33 -08:00
Hugo Benichi
33dd2dc700 Merge "BitUtils: support packing/unpacking negative long values" am: d5930606d1
am: 12ebdfdc5a

Change-Id: If85ad67169295e8725d654966c4d0f42439f10c4
2019-11-27 07:52:49 -08:00
Hugo Benichi
12ebdfdc5a Merge "BitUtils: support packing/unpacking negative long values"
am: d5930606d1

Change-Id: Ibd0c4756fb0f888a506111bb2f33c60debe33d57
2019-11-27 07:46:56 -08:00
Treehugger Robot
d5930606d1 Merge "BitUtils: support packing/unpacking negative long values" 2019-11-27 15:34:46 +00:00
Hugo Benichi
72da2b0e43 BitUtils: support packing/unpacking negative long values
Bug: None
Test: Compiled. New unit tests.
Change-Id: Ia543285e206b0bbc7d64458da10e68a951f9eec1
2019-11-27 11:00:32 +09:00
Chiachang Wang
735e7fae8f Merge "Refactor based on new NetworkMonitor" am: 3ad444cb32 am: 27f97a21da
am: 28e85dcd62

Change-Id: I7b5bb41d2e5d99a81565506a4274a38156e3afc2
2019-11-26 04:15:47 -08:00
Chiachang Wang
28e85dcd62 Merge "Refactor based on new NetworkMonitor" am: 3ad444cb32
am: 27f97a21da

Change-Id: I631487e6ccc500dd921ec04fa82713f35523dce8
2019-11-26 04:10:13 -08:00
Chiachang Wang
27f97a21da Merge "Refactor based on new NetworkMonitor"
am: 3ad444cb32

Change-Id: I6f2f42dee11b2ee3db9e52817cd7aa871539aaed
2019-11-26 04:03:47 -08:00
Chiachang Wang
3ad444cb32 Merge "Refactor based on new NetworkMonitor" 2019-11-26 10:52:33 +00:00
Chiachang Wang
f6cf0703a3 Refactor based on new NetworkMonitor
Bug: 130325409
Test: atest NetworkStackIntegrationTests
Change-Id: I4426be339cb9990c05b3f4fb5666bd70bcd0f78e
2019-11-26 09:10:45 +08:00
Chalard Jean
f99f4b33be Merge "[NS A11] Small refactor" am: 39a3f236b6 am: ab187ef67c
am: f462876106

Change-Id: I9130f7d348b53333188de759fb9529b74be63323
2019-11-25 10:38:23 -08:00
Paul Hu
2dd1f14da1 Merge "Fix hasUseBackgroundNetworksPermission issue." am: bc582ab167 am: c4ca8c9877
am: 92079abc2d

Change-Id: I8a1575dedd6e3b7a8b60ee2ffd475d790aec55c4
2019-11-25 10:35:55 -08:00
Lucas Lin
a1265ce930 Merge "Fix title of PRIVATE_DNS_BROKEN notification when connecting VPN" am: acac9a269b am: e00efe4c24
am: 7e76a7bdb8

Change-Id: I9539e73842040e3a38a64c4b4863adfe32c893e9
2019-11-25 10:33:04 -08:00
paulhu
41de1e2c41 Merge "Adjust PermissionMonitor#startMonitoring in ConnectivityService" am: ac53988b48 am: 3f83cdb6f5
am: 9c674d1f37

Change-Id: I0d50f6bccc9fb18a54865b45a7e8d1eaff01ea9e
2019-11-25 08:23:23 -08:00
Chalard Jean
13aa1adc42 Merge changes I195d894e,I7069c111 am: ff8b7b351b am: f4cc54739a
am: 19bd6b4cb6

Change-Id: I3a8926f3b444f19b6db200c361ce348da25dbcb8
2019-11-25 07:20:17 -08:00
Aaron Huang
26477ec272 Merge "Expose IpConfiguration and ProxyInfo APIs" am: 1e6d453bc6 am: 2eb55c5f81
am: 0b9d4e8360

Change-Id: Iebd6cdd25f61a2255f1e17984bafda4c79a7d518
2019-11-25 07:16:49 -08:00
Chalard Jean
f462876106 Merge "[NS A11] Small refactor" am: 39a3f236b6
am: ab187ef67c

Change-Id: Ib593282845cca1bbd3a2b36a2049914fc73cbbd1
2019-11-25 06:22:26 -08:00
Paul Hu
92079abc2d Merge "Fix hasUseBackgroundNetworksPermission issue." am: bc582ab167
am: c4ca8c9877

Change-Id: I8b03c9e23ffc9ff46264d6307fb841a7eda76a76
2019-11-25 06:18:10 -08:00
Chalard Jean
ab187ef67c Merge "[NS A11] Small refactor"
am: 39a3f236b6

Change-Id: I317e6b99a51ddb0a3e49b08c595eb42f4edad1e9
2019-11-25 06:09:17 -08:00
Lucas Lin
7e76a7bdb8 Merge "Fix title of PRIVATE_DNS_BROKEN notification when connecting VPN" am: acac9a269b
am: e00efe4c24

Change-Id: I0cb5a78a4f95ad5f5668b6bee5394877f640a2d0
2019-11-25 06:08:58 -08:00
Paul Hu
c4ca8c9877 Merge "Fix hasUseBackgroundNetworksPermission issue."
am: bc582ab167

Change-Id: I6f378dcbbecb9848d02112b2d33c5a0f2d5c9d1f
2019-11-25 06:05:32 -08:00
Lucas Lin
e00efe4c24 Merge "Fix title of PRIVATE_DNS_BROKEN notification when connecting VPN"
am: acac9a269b

Change-Id: I2df410b6ceb0f9a28ee0f171bb2ff7cadd4cdefb
2019-11-25 05:56:29 -08:00
Chalard Jean
39a3f236b6 Merge "[NS A11] Small refactor" 2019-11-25 08:55:19 +00:00
Paul Hu
bc582ab167 Merge "Fix hasUseBackgroundNetworksPermission issue." 2019-11-25 08:41:05 +00:00
Lucas Lin
acac9a269b Merge "Fix title of PRIVATE_DNS_BROKEN notification when connecting VPN" 2019-11-25 08:14:09 +00:00
paulhu
9c674d1f37 Merge "Adjust PermissionMonitor#startMonitoring in ConnectivityService" am: ac53988b48
am: 3f83cdb6f5

Change-Id: I14ef8eaa83b3df3b032556504a23e6b17f02435d
2019-11-24 07:37:03 -08:00
paulhu
3f83cdb6f5 Merge "Adjust PermissionMonitor#startMonitoring in ConnectivityService"
am: ac53988b48

Change-Id: Ic4e26e2dcf6c68dcae9a840a3119283118e45193
2019-11-24 07:31:36 -08:00
Treehugger Robot
ac53988b48 Merge "Adjust PermissionMonitor#startMonitoring in ConnectivityService" 2019-11-24 15:21:43 +00:00
paulhu
121b2fb600 Fix hasUseBackgroundNetworksPermission issue.
PermissionMonitor#hasUseBackgroundNetworksPermission only uses
the first package name of the uid for checking permission.
This is incorrect since each package declared different
permissions. So using the mApps which already checked both
network and using restricted network permissions. If uid is in
the mApps list that means uid has one of permission at least.

Bug: 135897744
Test: atest FrameworksNetTests
Change-Id: I3500a03ce06b5b822311ad0c67b606ce4039216a
2019-11-24 22:27:32 +08:00
Chalard Jean
19bd6b4cb6 Merge changes I195d894e,I7069c111 am: ff8b7b351b
am: f4cc54739a

Change-Id: Ia75369ad6b360644392766296542efa4a5fdf0ce
2019-11-22 06:33:34 -08:00