Chalard Jean
646171fe03
Merge "[NS A11] Small refactor" am: a8e2afde61 am: 22391f5092
...
am: 758e340c84
2019-11-25 10:38:23 -08:00
Paul Hu
f988293d3c
Merge "Fix hasUseBackgroundNetworksPermission issue." am: 0a6f03873a am: d47085c444
...
am: 36872f15f5
2019-11-25 10:35:55 -08:00
Lucas Lin
b0450caf3f
Merge "Fix title of PRIVATE_DNS_BROKEN notification when connecting VPN" am: fc8c834040 am: 22ba258b99
...
am: 61fcd4126f
2019-11-25 10:33:04 -08:00
paulhu
ace8807b44
Merge "Adjust PermissionMonitor#startMonitoring in ConnectivityService" am: 5d6da8de07 am: 9717a198bb
...
am: 97e1cdb105
2019-11-25 08:23:23 -08:00
Chalard Jean
6aaf2bc277
Merge changes I195d894e,I7069c111 am: 3d59a27d1c am: cc64d36d32
...
am: 6e40e5fa0b
2019-11-25 07:20:17 -08:00
Aaron Huang
402cea9bfd
Merge "Expose IpConfiguration and ProxyInfo APIs" am: c2df0b68c4 am: 10481a8f5f
...
am: d91e5a5ccb
2019-11-25 07:16:49 -08:00
Chalard Jean
758e340c84
Merge "[NS A11] Small refactor" am: a8e2afde61
...
am: 22391f5092
2019-11-25 06:22:26 -08:00
Paul Hu
36872f15f5
Merge "Fix hasUseBackgroundNetworksPermission issue." am: 0a6f03873a
...
am: d47085c444
2019-11-25 06:18:10 -08:00
Chalard Jean
22391f5092
Merge "[NS A11] Small refactor"
...
am: a8e2afde61
2019-11-25 06:09:17 -08:00
Lucas Lin
61fcd4126f
Merge "Fix title of PRIVATE_DNS_BROKEN notification when connecting VPN" am: fc8c834040
...
am: 22ba258b99
2019-11-25 06:08:58 -08:00
Paul Hu
d47085c444
Merge "Fix hasUseBackgroundNetworksPermission issue."
...
am: 0a6f03873a
2019-11-25 06:05:32 -08:00
Lucas Lin
22ba258b99
Merge "Fix title of PRIVATE_DNS_BROKEN notification when connecting VPN"
...
am: fc8c834040
2019-11-25 05:56:29 -08:00
Chalard Jean
a8e2afde61
Merge "[NS A11] Small refactor"
2019-11-25 08:55:19 +00:00
Paul Hu
0a6f03873a
Merge "Fix hasUseBackgroundNetworksPermission issue."
2019-11-25 08:41:05 +00:00
Lucas Lin
fc8c834040
Merge "Fix title of PRIVATE_DNS_BROKEN notification when connecting VPN"
2019-11-25 08:14:09 +00:00
paulhu
97e1cdb105
Merge "Adjust PermissionMonitor#startMonitoring in ConnectivityService" am: 5d6da8de07
...
am: 9717a198bb
2019-11-24 07:37:03 -08:00
paulhu
9717a198bb
Merge "Adjust PermissionMonitor#startMonitoring in ConnectivityService"
...
am: 5d6da8de07
2019-11-24 07:31:36 -08:00
Treehugger Robot
5d6da8de07
Merge "Adjust PermissionMonitor#startMonitoring in ConnectivityService"
2019-11-24 15:21:43 +00:00
paulhu
9b2c01a7f0
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
6e40e5fa0b
Merge changes I195d894e,I7069c111 am: 3d59a27d1c
...
am: cc64d36d32
2019-11-22 06:33:34 -08:00
Chalard Jean
cc64d36d32
Merge changes I195d894e,I7069c111
...
am: 3d59a27d1c
2019-11-22 06:27:42 -08:00
Chalard Jean
3d59a27d1c
Merge changes I195d894e,I7069c111
...
* changes:
[NS A10] Cleanup
[NS A09] Always rematch all networks to requests
2019-11-22 14:08:09 +00:00
Aaron Huang
d91e5a5ccb
Merge "Expose IpConfiguration and ProxyInfo APIs" am: c2df0b68c4
...
am: 10481a8f5f
2019-11-22 01:47:14 -08:00
Aaron Huang
10481a8f5f
Merge "Expose IpConfiguration and ProxyInfo APIs"
...
am: c2df0b68c4
2019-11-22 01:40:49 -08:00
Aaron Huang
c2df0b68c4
Merge "Expose IpConfiguration and ProxyInfo APIs"
2019-11-22 09:25:16 +00:00
lucaslin
784ca66669
Fix title of PRIVATE_DNS_BROKEN notification when connecting VPN
...
NetworkNotificationManager will only get the first transport
type from the NetworkCapabilities of network, and if the device
connects to a VPN and its underlying network is wifi, then the
first finding transport type will be TRANSPORT_WIFI. So, if the
private DNS is broken when device connected to VPN,
NetworkNotificationManager will try to get the SSID for the
title of notification but failed. For this kind of case, the
title of PRIVATE_DNS_BROKEN notification will show
"null has no internet access".
Bug: 143340533
Test: 1. Build pass.
2. Connect to VPN and let private DNS to be broken, check
title of PRIVATE_DNS_BROKEN notification.
3. atest FrameworksNetTests
Change-Id: I1ed018cc8774d4fce4b94854f8e8703a28818463
2019-11-22 12:46:32 +08:00
Chalard Jean
ca7e22fea5
Merge "Cut the dependency to APN constants" am: f1df59afe3 am: ca757d6635
...
am: 832da6e8c4
2019-11-21 05:00:52 -08:00
Chalard Jean
832da6e8c4
Merge "Cut the dependency to APN constants" am: f1df59afe3
...
am: ca757d6635
2019-11-21 04:52:31 -08:00
Chalard Jean
ca757d6635
Merge "Cut the dependency to APN constants"
...
am: f1df59afe3
2019-11-21 04:45:07 -08:00
Chalard Jean
f1df59afe3
Merge "Cut the dependency to APN constants"
2019-11-21 12:37:33 +00:00
Chalard Jean
7eb4a341be
Merge changes I52f70756,Icc621f0a am: 3701fcd817 am: 41e584fa48
...
am: f9cc6e88e6
2019-11-21 01:03:56 -08:00
Chalard Jean
f9cc6e88e6
Merge changes I52f70756,Icc621f0a am: 3701fcd817
...
am: 41e584fa48
2019-11-21 00:56:08 -08:00
Chalard Jean
41e584fa48
Merge changes I52f70756,Icc621f0a
...
am: 3701fcd817
2019-11-21 00:48:38 -08:00
Chalard Jean
3701fcd817
Merge changes I52f70756,Icc621f0a
...
* changes:
[NS A08] Tiny refactoring
[NS A07] Move the last side effects out of the decision loop.
2019-11-21 08:32:35 +00:00
Chalard Jean
afaed1a5e0
Cut the dependency to APN constants
...
With Telephony moving to Mainline these constants are not accessible
any more, and should not be made public. As they are only used by
a deprecated method that can only be called by apps with a target
SDK < M and only for one of the features it used to handle, copying
the constants until this method is completely removed is the simplest
way to go.
Test: FrameworksNetTests
Bug: 144454341
Change-Id: Iea18c8d2f2c8a40f04db9383d3f74b917267ba25
2019-11-21 14:48:00 +09:00
Meng Wang
0f7c764ef0
Merge "Use TelephonyManager instead of ITelephony Binder" am: 138728da9a am: 565782e413
...
am: 1e9a9a3d4f
2019-11-20 20:59:54 -08:00
Meng Wang
1e9a9a3d4f
Merge "Use TelephonyManager instead of ITelephony Binder" am: 138728da9a
...
am: 565782e413
2019-11-20 20:51:54 -08:00
Meng Wang
565782e413
Merge "Use TelephonyManager instead of ITelephony Binder"
...
am: 138728da9a
2019-11-20 20:44:19 -08:00
Meng Wang
138728da9a
Merge "Use TelephonyManager instead of ITelephony Binder"
2019-11-21 04:36:10 +00:00
Chalard Jean
dc5ea899c8
Merge changes I493b969c,I7b759425,I60fe318a,Ie4ae6a97,I2379e47b, ... am: e2427502f1 am: 3bac6b4b1c
...
am: 5dcb5ee7a0
2019-11-20 20:28:29 -08:00
Chalard Jean
5dcb5ee7a0
Merge changes I493b969c,I7b759425,I60fe318a,Ie4ae6a97,I2379e47b, ... am: e2427502f1
...
am: 3bac6b4b1c
2019-11-20 20:16:46 -08:00
Chalard Jean
3bac6b4b1c
Merge changes I493b969c,I7b759425,I60fe318a,Ie4ae6a97,I2379e47b, ...
...
am: e2427502f1
Change-Id: Ic5b59cb5e23feaf7aac0075f16afa3da94d3628c
2019-11-20 20:08:51 -08:00
Meng Wang
ed6f441315
Use TelephonyManager instead of ITelephony Binder
...
Bug: 140908357
Test: make
Change-Id: If3be915329cc27c560af3fd71a903984a626aca8
2019-11-20 10:05:33 -08:00
Chalard Jean
798cb4d8b9
Merge "Rename waitForConnectivityBroadcast" am: eb6a236187 am: 0f6c70e0f8
...
am: 6307e13292
2019-11-20 06:21:12 -08:00
Chalard Jean
6307e13292
Merge "Rename waitForConnectivityBroadcast" am: eb6a236187
...
am: 0f6c70e0f8
2019-11-20 06:12:16 -08:00
Chalard Jean
0f6c70e0f8
Merge "Rename waitForConnectivityBroadcast"
...
am: eb6a236187
Change-Id: I10ecb001c2654de1636e639ac52c719f03e007a4
2019-11-20 06:04:45 -08:00
Aaron Huang
fb8581aac0
Expose IpConfiguration and ProxyInfo APIs
...
Moving IpConfiguration methods to system API
for mainline support.
Public copy constructors of ProxyInfo and add
buildPacProxy(Uri, int) to create a new proxy
properties.
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: I07bcd2a34a222ea2b3cf0d8b497f051011c41c2c
2019-11-20 20:07:05 +08:00
Chalard Jean
f5ff770f70
[NS A11] Small refactor
...
Test: ConnectivityServiceTest
Change-Id: I9c4247e0ed67c76d10575bd1a8fb5ff7780a1206
2019-11-20 20:42:41 +09:00
Chalard Jean
0a8afdae5d
[NS A10] Cleanup
...
Reap networks after all networks have been rematched.
Bug: 113554781
Test: ConnectivityServiceTest
Change-Id: I195d894e702f1c738ea25596704ea73a3ae55031
2019-11-20 20:42:41 +09:00
Chalard Jean
b0b3bc6d3d
[NS A09] Always rematch all networks to requests
...
This is a regression in performance but it is necessary for
the sake of refactoring ; when the refactoring is over, the
performance will be improved back.
Test: ConnectivityServiceTest
Change-Id: I7069c11193dccb7dce6af65cfb731c0f4ad93629
2019-11-20 20:42:40 +09:00
