Commit Graph

8650 Commits

Author SHA1 Message Date
Anil Admal
27f11673f8 Merge "Merge "Extend support for requestRouteToHostAddress for backward compatibility" am: 1470d8a3b8 am: 13bd6a8585" into qt-dev-plus-aosp
am: 7fecc34996

Change-Id: Ifa4ec98d5c942522dfd569664f169fa841d495ed
2019-04-08 15:49:09 -07:00
Chenbo Feng
8a41405ed3 Merge "[automerger skipped] Merge "Move NetworkStatsFactory into service directory" am: c832132056 am: e1ab564e95 -s ours
am: 3427f091e0 -s ours
am skip reason: change_id Ifcfe4df81caf8ede2e4e66a76552cb3200378fa8 with SHA1 6566d1b82f is in history

Change-Id: Ica19aba40268a7e4facbc35cb108ab9fdc1c1ada
2019-04-08 14:11:16 -07:00
Remi NGUYEN VAN
9729f026f9 [automerger skipped] Merge "Add FrameworksNetTests dependency on libcgrouprc" am: eade5d227d -s ours
am: e214f3c72c -s ours
am skip reason: change_id Ifcfe4df81caf8ede2e4e66a76552cb3200378fa8 with SHA1 550ed56426 is in history

Change-Id: I9118558df88aac3cca342592ff8aa8ca9030e2a5
2019-04-08 12:55:30 -07:00
Anil Admal
3b5a296b8f Merge "Extend support for requestRouteToHostAddress for backward compatibility" am: 1470d8a3b8
am: 13bd6a8585

Change-Id: Ifa60d8f2d60aba4c4e2894dc612c224d45e3992d
2019-04-08 12:36:02 -07:00
Chenbo Feng
851d214518 [automerger skipped] Merge "Move NetworkStatsFactory into service directory" am: c832132056
am: e1ab564e95 -s ours
am skip reason: change_id Ifcfe4df81caf8ede2e4e66a76552cb3200378fa8 with SHA1 6566d1b82f is in history

Change-Id: I419ae9923a510c9691c8c88911ac45fe76846166
2019-04-08 12:06:35 -07:00
Remi NGUYEN VAN
e214f3c72c [automerger skipped] Merge "Add FrameworksNetTests dependency on libcgrouprc"
am: eade5d227d -s ours
am skip reason: change_id Ifcfe4df81caf8ede2e4e66a76552cb3200378fa8 with SHA1 550ed56426 is in history

Change-Id: Ic374e952cc1ccdd422baf9cbb709f1e37268e220
2019-04-08 03:32:49 -07:00
Treehugger Robot
eade5d227d Merge "Add FrameworksNetTests dependency on libcgrouprc" 2019-04-08 10:19:26 +00:00
junyulai
7509e6e053 Fix onBlockedStatusChanged does not work on multiple networks
There is a logic error in maybeNotifyNetworkBlockedForNewUidRules
that caused function to return if there is no status change in
the first network. This would cause CTS failed in devices which
has volte-enabled SIM inserted.

Bug: 129409153
Fix: 117969394
Test: 1. atest com.android.cts.net.HostsideNetworkCallbackTests \
         --generate-new-metrics 20
      2. atest FrameworksNetTests

Change-Id: Ifd18d1c6ad708c1dbc793f03d8241f572af50317
2019-04-08 17:15:52 +08:00
Remi NGUYEN VAN
f60a978e3c [automerger skipped] Merge "Move attach*Filter() and addArpEntry() methods to NetworkStack" into qt-dev am: 7d4a9b5b26
am: f2e23a2cd4 -s ours
am skip reason: change_id I66d7b3e4fbfa32bb0bc853e8cf9399031daff8a9 with SHA1 77ab651bf3 is in history

Change-Id: I7c96e3a278b0b7b6ffe3d923af05e896c024903f
2019-04-08 01:55:16 -07:00
Remi NGUYEN VAN
f2e23a2cd4 Merge "Move attach*Filter() and addArpEntry() methods to NetworkStack" into qt-dev
am: 7d4a9b5b26

Change-Id: I2ba0d7efdce68bea09e877827573cfcb13334b6e
2019-04-08 01:46:02 -07:00
Remi NGUYEN VAN
ecbcb7fbfc Add FrameworksNetTests dependency on libcgrouprc
The tests are currently broken without this dependency.

Bug: 129902619
Test: atest FrameworksNetTests
Merged-In: Ifcfe4df81caf8ede2e4e66a76552cb3200378fa8
Change-Id: I85891485157ed86e069039dfe3092028ff703dd5
2019-04-08 17:34:47 +09:00
Remi NGUYEN VAN
1da5fac070 Move attach*Filter() and addArpEntry() methods to NetworkStack
The SocketUtils.attach*Filter and SocketUtils.addArpEntry methods
were added there because they could not be added as JNI inside
the NetworkStack. This was not possible because on Go devices,
the NetworkStack was a jar library. But now, Go also uses an APK.
Hence, move these methods to the NetworkStack.

Fixes: 129433183
Merged-In: I66d7b3e4fbfa32bb0bc853e8cf9399031daff8a9
(cherry picked from commit fe71be2b04a3213828dc0347a1dd4a3675d20562)

Change-Id: Ice433a41469e784385f19498c154345d7b9c69b5
2019-04-08 01:41:39 +00:00
Anil Admal
13bd6a8585 Merge "Extend support for requestRouteToHostAddress for backward compatibility"
am: 1470d8a3b8

Change-Id: I1ecdf945f60d09216e6e8b54754d4feba0437ac1
2019-04-07 17:09:20 -07:00
Treehugger Robot
1470d8a3b8 Merge "Extend support for requestRouteToHostAddress for backward compatibility" 2019-04-07 23:48:32 +00:00
Chenbo Feng
e1ab564e95 Merge "Move NetworkStatsFactory into service directory"
am: c832132056

Change-Id: If92f556cbf3badcb057a3b6e43bb3ef74d0c9ac0
2019-04-05 13:26:28 -07:00
Treehugger Robot
c832132056 Merge "Move NetworkStatsFactory into service directory" 2019-04-05 19:27:22 +00:00
Anil Admal
e1a2886f73 Extend support for requestRouteToHostAddress for backward compatibility
The gnss@2.0 HAL and the framework GNSS Location Provider code is
updated in Q to not call the deprecated requestRouteToHost() method.
However, devices upgrading to Q which are still using gnss@1.1 or
earlier HAL must continued to be supported.

Fixes: 121222025
Test: Tested with gnss@1.1 HAL and first API level P.  The
      ConnectivityService log message "This method exists only for
      app backwards compatibility and must not be called by system
      services" is not present for devices with first API level P.

Change-Id: I10199776ea413dc256dbf0771e6cb3eedb334495
2019-04-05 10:06:37 -07:00
Remi NGUYEN VAN
77ab651bf3 Merge "Merge "Move attach*Filter() and addArpEntry() methods to NetworkStack" am: 82b74785d7 am: 6dad7305af" into qt-dev-plus-aosp
am: d77d95df7a

Change-Id: I66d7b3e4fbfa32bb0bc853e8cf9399031daff8a9
2019-04-05 04:44:45 -07:00
Remi NGUYEN VAN
13e4633bcd Merge "Merge "Call clearCallingIdentity before notifyDnsResponse" am: c7b33f7572 am: ffc15401f3" into qt-dev-plus-aosp
am: 55f9b6eaca

Change-Id: I2b1dfae776ecd4f5d68c1a8c5a63b3fa12230729
2019-04-05 04:23:40 -07:00
Remi NGUYEN VAN
85c61fc88d Merge "Move attach*Filter() and addArpEntry() methods to NetworkStack" am: 82b74785d7
am: 6dad7305af

Change-Id: If5c236c85585a440bfb645cff9d3cb0bb4e11102
2019-04-05 03:31:36 -07:00
Remi NGUYEN VAN
a4752ea66b Merge "Call clearCallingIdentity before notifyDnsResponse" am: c7b33f7572
am: ffc15401f3

Change-Id: I5e3d6aacbeaba7346e014875a457a0ac52977ead
2019-04-05 03:22:16 -07:00
Remi NGUYEN VAN
6dad7305af Merge "Move attach*Filter() and addArpEntry() methods to NetworkStack"
am: 82b74785d7

Change-Id: I1d6a490a42f68d01e3d0649035cd0015cb522da3
2019-04-04 23:50:27 -07:00
Remi NGUYEN VAN
82b74785d7 Merge "Move attach*Filter() and addArpEntry() methods to NetworkStack" 2019-04-05 06:38:08 +00:00
Remi NGUYEN VAN
fb21e4697b Add common tests for FrameworksBaseTests and CTS
The common package covers tests that should be included both in CTS and
unit tests.

Test: atest FrameworksBaseTests
Bug: 129199908
Change-Id: Ic78ff947250871fa773252c924f1dee9395c6074
(cherry picked from commit 054e3e0f5ebfffe5d9fdd0095abac309552ae0cd)
2019-04-05 05:52:03 +00:00
Remi NGUYEN VAN
ffc15401f3 Merge "Call clearCallingIdentity before notifyDnsResponse"
am: c7b33f7572

Change-Id: I21d52314f332a12bdd96d8f20e68a3eb38f70d6b
2019-04-04 19:02:18 -07:00
Remi NGUYEN VAN
c7b33f7572 Merge "Call clearCallingIdentity before notifyDnsResponse" 2019-04-05 01:54:08 +00:00
Remi NGUYEN VAN
689c57ea5f Merge "Add common tests for FrameworksBaseTests and CTS" am: e2908b64dd am: 25a8bf080c
am: 732b67a250

Change-Id: Ic78ff947250871fa773252c924f1dee9395c6074
2019-04-04 09:47:10 -07:00
Lorenzo Colitti
2839635c9f Merge "Fix flaky UdpEncapsulationSocket test" am: 95e8a2b5c3 am: 3b7fefe97e
am: 97a2e106c5

Change-Id: Iad9aea4b42cd8b31a5a2659bb9cb54dd1c64e8b7
2019-04-04 09:29:35 -07:00
Remi NGUYEN VAN
732b67a250 Merge "Add common tests for FrameworksBaseTests and CTS" am: e2908b64dd
am: 25a8bf080c

Change-Id: I863ffea6358a353986cee7b1c76622c434310bba
2019-04-04 09:25:22 -07:00
Lorenzo Colitti
97a2e106c5 Merge "Fix flaky UdpEncapsulationSocket test" am: 95e8a2b5c3
am: 3b7fefe97e

Change-Id: Idf040a67e53d9b9ec6e6c647ce24f8ada501d355
2019-04-04 09:18:29 -07:00
Remi NGUYEN VAN
25a8bf080c Merge "Add common tests for FrameworksBaseTests and CTS"
am: e2908b64dd

Change-Id: I1616831ad8f143298b80ebce9af205f8e50de1f8
2019-04-04 05:42:21 -07:00
Treehugger Robot
e2908b64dd Merge "Add common tests for FrameworksBaseTests and CTS" 2019-04-04 12:29:44 +00:00
paulhu
95ff0b438c Merge "Fix ConnectivityServiceTest fail." am: 362d9fb687 am: f55f77908d
am: c999faee0e

Change-Id: Ic77ef73841266da487401ffd657ef63562b6fc1e
2019-04-04 01:53:31 -07:00
Lorenzo Colitti
3b7fefe97e Merge "Fix flaky UdpEncapsulationSocket test"
am: 95e8a2b5c3

Change-Id: I4d6cc85fcd539a38674fc3daff1af57fa1bdd2f7
2019-04-04 01:38:02 -07:00
Lorenzo Colitti
95e8a2b5c3 Merge "Fix flaky UdpEncapsulationSocket test" 2019-04-04 08:09:06 +00:00
paulhu
c999faee0e Merge "Fix ConnectivityServiceTest fail." am: 362d9fb687
am: f55f77908d

Change-Id: I7f185e731db91c30a9b0f14aefbdbb067942190e
2019-04-04 00:57:26 -07:00
paulhu
b6d9484ef0 Merge "Fix ConnectivityServiceTest fail." am: 362d9fb687 am: f55f77908d
am: 5237e2ee93

Change-Id: I0230ea353a91283328c8df06ca5a89af99c40468
2019-04-03 18:47:51 -07:00
paulhu
5237e2ee93 Merge "Fix ConnectivityServiceTest fail." am: 362d9fb687
am: f55f77908d

Change-Id: I7896f6c47478df6f4b70b68da98694f4b0e1563f
2019-04-03 17:57:14 -07:00
Benedict Wong
b5bc70dc6a Fix flaky UdpEncapsulationSocket test
This commit reduces the flakiness of the
testOpenAndCloseUdpEncapsulationSocket by retrying up to three times.
Unfortunately, testing port-selected socket creation is racy against
other applications. This helps to handle the same race condition as done
in IpSecService#bindToRandomPort

Bug: 128024100
Test: 200x runs of testOpenAndCloseUdpEncapsulationSocket
Change-Id: I7e036ce821019dbac6c50899bd0894e89d2fe82a
2019-04-03 17:52:03 -07:00
Bill Rassieur
1d477220e0 Merge master@5428150 into git_qt-dev-plus-aosp.
am: e8a7aba65c

Change-Id: I49b4a82ccabbcdd0b2b2be3abf95d796414666c6
2019-04-03 17:50:35 -07:00
paulhu
f55f77908d Merge "Fix ConnectivityServiceTest fail."
am: 362d9fb687

Change-Id: If3f7a3cbf2ed1a180a3b09872512a5f91bddd89c
2019-04-03 17:24:39 -07:00
Treehugger Robot
362d9fb687 Merge "Fix ConnectivityServiceTest fail." 2019-04-03 23:54:38 +00:00
TreeHugger Robot
76e2c02339 Merge "Move NetworkStatsFactory into service directory" 2019-04-03 23:44:26 +00:00
Bill Rassieur
d150242aeb Merge master@5406228 into git_qt-dev-plus-aosp.
am: 7a129c706d

Change-Id: I684e995988f5a8ef330fbbf55da7ae9230f0cfc2
2019-04-03 16:41:27 -07:00
Chenbo Feng
6566d1b82f Move NetworkStatsFactory into service directory
In order to notify netd to swap eBPF maps before pulling the
networkStats from eBPF maps, NetworkStatsFactory need to use the
NetdServices to issue binder calls. So it need to be moved from
framework/base/core to framework/base/service since object in
framework/base/core cannot get any system services. This change is also
necessary for setting up a lock inside NetworkStatsFactory to prevent
racing between two netstats caller since the lock need to be hold before
netd trigger the map swap.

Also fix the compile problem caused by moving the NetworkStatsFactory
and the related tests. Rename the packages and the jni functions to a
more proper name.

Bug: 124764595
Bug: 128900919
Test: NetworkStatsFactoryTest
      android.app.usage.cts.NetworkUsageStatsTest
      android.net.cts.TrafficStatsTest

Change-Id: Ifcfe4df81caf8ede2e4e66a76552cb3200378fa8
2019-04-03 14:28:41 -07:00
Chalard Jean
8aaebde014 Merge "Straighten AIDL interface for the memory store" 2019-04-03 19:58:46 +00:00
Chenbo Feng
550ed56426 Move NetworkStatsFactory into service directory
In order to notify netd to swap eBPF maps before pulling the
networkStats from eBPF maps, NetworkStatsFactory need to use the
NetdServices to issue binder calls. So it need to be moved from
framework/base/core to framework/base/service since object in
framework/base/core cannot get any system services. This change is also
necessary for setting up a lock inside NetworkStatsFactory to prevent
racing between two netstats caller since the lock need to be hold before
netd trigger the map swap.

Also fix the compile problem caused by moving the NetworkStatsFactory
and the related tests. Rename the packages and the jni functions to a
more proper name.

Bug: 124764595
Bug: 128900919
Test: NetworkStatsFactoryTest
      android.app.usage.cts.NetworkUsageStatsTest
      android.net.cts.TrafficStatsTest

Merged-In: Ifcfe4df81caf8ede2e4e66a76552cb3200378fa8
Change-Id: Ifcfe4df81caf8ede2e4e66a76552cb3200378fa8
2019-04-03 11:33:40 -07:00
Chenbo Feng
9a10bb92b7 Merge "Clean up permissions when uids are no longer used" am: 9235821478 am: 6825c65462
am: c3a583e52e

Change-Id: I7773132d11d6225eac91ab2fee1043159c295d83
2019-04-03 11:03:32 -07:00
Chenbo Feng
c3a583e52e Merge "Clean up permissions when uids are no longer used" am: 9235821478
am: 6825c65462

Change-Id: I256ca6f16ea1fcd240a1b7cd2b3199d4504e6c33
2019-04-03 10:50:39 -07:00
Chenbo Feng
6825c65462 Merge "Clean up permissions when uids are no longer used"
am: 9235821478

Change-Id: I3c06a36368abb9a1e7885d281ea1155fce857eea
2019-04-03 10:38:57 -07:00