Commit Graph

6542 Commits

Author SHA1 Message Date
Chenbo Feng
52e0de980e Merge "Add smoke test for jni library" am: 98ad72632c am: 22f45a249d
am: 93967660a1

Change-Id: I1078ad41f5c04d6d2e07879dfae19c31534b763b
2019-04-10 02:42:26 -07:00
Chenbo Feng
93967660a1 Merge "Add smoke test for jni library" am: 98ad72632c
am: 22f45a249d

Change-Id: Iba607c906917017f79f141f4e0599a2330cc0f14
2019-04-10 00:01:28 -07:00
Chenbo Feng
22f45a249d Merge "Add smoke test for jni library"
am: 98ad72632c

Change-Id: Iedb44739539f63090b067c1a25d4e83c333caddb
2019-04-09 23:50:10 -07:00
Treehugger Robot
98ad72632c Merge "Add smoke test for jni library" 2019-04-10 06:30:26 +00:00
Chenbo Feng
ba01e6c570 Add smoke test for jni library
Since the Framework net test require jni library
libnetworkstatsfactorytestjni, but the test fails to load that library
unless *all* the dependencies of that library are explicitly listed in
jni_libs, whenever any of the dependencies changes the framework net
test will start failing and it might not be catched since the change
might not related to frameworks/base. And this smoke test is aimed to
spot those native library changes and it should be stable enough to put
in global presubmit.

Bug: 124764595
Test: FrameworksNetSmokeTests
Change-Id: Id24e7f0558b5643e4ad7393e85f1f0a2bd875615
2019-04-09 14:45:35 -07:00
Benedict Wong
9542438928 Merge "Fix remove-before-add for IpSecService RefcountedResource" am: 342d6de289 am: 15b70fe885
am: b64f22c9b4

Change-Id: Ib955acaa5e498c0e977cb5f2e48cffbc9fea8c7c
2019-04-09 11:31:46 -07:00
Benedict Wong
b64f22c9b4 Merge "Fix remove-before-add for IpSecService RefcountedResource" am: 342d6de289
am: 15b70fe885

Change-Id: I416c2e43961ec0e1cc6b2fbcef970fbce858603b
2019-04-09 10:56:30 -07:00
Benedict Wong
15b70fe885 Merge "Fix remove-before-add for IpSecService RefcountedResource"
am: 342d6de289

Change-Id: Ief286a54a93efd731deeff9fc32815663ab7695d
2019-04-09 10:39:16 -07:00
Benedict Wong
342d6de289 Merge "Fix remove-before-add for IpSecService RefcountedResource" 2019-04-09 17:22:56 +00:00
Chalard Jean
f25db47fc5 [automerger skipped] Merge "Address leftover comments on aosp/894233" into qt-dev am: fa6c7828b5 -s ours
am: 2a310fd768 -s ours
am skip reason: change_id Idf24f42a86bbfcc89e3ea8cf50d1b705d72ac613 with SHA1 ce140af98c is in history

Change-Id: I9004b0471c951fe7c64b2f384c3666f40b3360e9
2019-04-09 09:16:10 -07:00
Junyu Lai
6b517ce723 Merge "Fix onBlockedStatusChanged does not work on multiple networks" am: eb70ae41c6 am: db161dda22
am: bbc12176d2

Change-Id: I11168fd07a7c29e0605f2e874e9d9f41b5ad88b6
2019-04-09 08:59:00 -07:00
Chalard Jean
2a310fd768 [automerger skipped] Merge "Address leftover comments on aosp/894233" into qt-dev
am: fa6c7828b5 -s ours
am skip reason: change_id Idf24f42a86bbfcc89e3ea8cf50d1b705d72ac613 with SHA1 ce140af98c is in history

Change-Id: I6e9043be4c28b73856b72f80971e2b66f8b8926b
2019-04-09 06:54:57 -07:00
Junyu Lai
bbc12176d2 Merge "Fix onBlockedStatusChanged does not work on multiple networks" am: eb70ae41c6
am: db161dda22

Change-Id: I4e414fd34b463219e6374de15622918af7d7fa49
2019-04-09 06:50:52 -07:00
TreeHugger Robot
fa6c7828b5 Merge "Address leftover comments on aosp/894233" into qt-dev 2019-04-09 13:39:29 +00:00
Junyu Lai
db161dda22 Merge "Fix onBlockedStatusChanged does not work on multiple networks"
am: eb70ae41c6

Change-Id: Ia8edf1e9d0f49da5be2bac1889cd0001010a869b
2019-04-09 05:43:18 -07:00
Chalard Jean
fd95136ad9 Address leftover comments on aosp/894233
Cherry-pick from commit 415f523f7ce4c7e33fa70ea003f265e5b53faa20,
with small conflict resolution.

Bug: 129510344
Test: m, boots, wifi connects, resolves DNS
Change-Id: Idf24f42a86bbfcc89e3ea8cf50d1b705d72ac613
Merged-In: Idf24f42a86bbfcc89e3ea8cf50d1b705d72ac613
Merged-In: Ia08104f839ef37139a8761e2e625bb10c94c275f
2019-04-09 12:16:52 +00:00
Junyu Lai
eb70ae41c6 Merge "Fix onBlockedStatusChanged does not work on multiple networks" 2019-04-09 12:13:26 +00:00
Lorenzo Colitti
c997ce5331 [automerger skipped] Merge "Fix ConnectivityServiceTest fail." into qt-dev am: 0483f072fa -s ours
am: 684a1fedc0 -s ours
am skip reason: change_id I7f185e731db91c30a9b0f14aefbdbb067942190e with SHA1 c999faee0e is in history

Change-Id: I8ae903ed61dd37a37b36e2f878e4f90977e9c1bd
2019-04-09 04:55:57 -07:00
Lorenzo Colitti
446aea444c [automerger skipped] Merge "Fix flaky UdpEncapsulationSocket test" into qt-dev am: 6e8628f043 -s ours
am: 55a77067a8 -s ours
am skip reason: change_id Idf040a67e53d9b9ec6e6c647ce24f8ada501d355 with SHA1 97a2e106c5 is in history

Change-Id: Ic488c621c0ebe04c6298d7d2a06201abcbb61a37
2019-04-09 04:33:08 -07:00
Lorenzo Colitti
5331fbdc28 [automerger skipped] Merge "Extend support for requestRouteToHostAddress for backward compatibility" into qt-dev am: 8d994400b5 -s ours
am: 0eb34c5415 -s ours
am skip reason: change_id Ifa60d8f2d60aba4c4e2894dc612c224d45e3992d with SHA1 3b5a296b8f is in history

Change-Id: If24f59d5cd8b1b92ed1bf84589a0dfede9b247db
2019-04-09 04:27:25 -07:00
Lorenzo Colitti
684a1fedc0 [automerger skipped] Merge "Fix ConnectivityServiceTest fail." into qt-dev
am: 0483f072fa -s ours
am skip reason: change_id I7f185e731db91c30a9b0f14aefbdbb067942190e with SHA1 c999faee0e is in history

Change-Id: I6eddfc7bae967c76c63521b7fbcabd78a913bfd4
2019-04-09 03:44:42 -07:00
Lorenzo Colitti
0483f072fa Merge "Fix ConnectivityServiceTest fail." into qt-dev 2019-04-09 10:25:10 +00:00
Chalard Jean
418700f601 Merge "Merge "Address leftover comments on aosp/894233" am: 3753f67bcd am: c4b0483288" into qt-dev-plus-aosp
am: 21273659ca

Change-Id: I51ffa1193ca495c496319dea2a182cea61e44408
2019-04-09 03:08:14 -07:00
Remi NGUYEN VAN
dd20963090 Merge "Merge "Add common tests for FrameworksBaseTests and CTS" into qt-dev am: 29b6be1471" into qt-dev-plus-aosp
am: c5d65b570e

Change-Id: I3d7855839bf19b4481295d8cd1c7f55a192f936d
2019-04-09 02:32:45 -07:00
Lorenzo Colitti
55a77067a8 [automerger skipped] Merge "Fix flaky UdpEncapsulationSocket test" into qt-dev
am: 6e8628f043 -s ours
am skip reason: change_id Idf040a67e53d9b9ec6e6c647ce24f8ada501d355 with SHA1 97a2e106c5 is in history

Change-Id: Ic9b6b8c2ca4aabd3ed18291a94992a2b67286064
2019-04-09 02:31:35 -07:00
TreeHugger Robot
6e8628f043 Merge "Fix flaky UdpEncapsulationSocket test" into qt-dev 2019-04-09 09:15:02 +00:00
Lorenzo Colitti
0eb34c5415 [automerger skipped] Merge "Extend support for requestRouteToHostAddress for backward compatibility" into qt-dev
am: 8d994400b5 -s ours
am skip reason: change_id Ifa60d8f2d60aba4c4e2894dc612c224d45e3992d with SHA1 3b5a296b8f is in history

Change-Id: I7cd14e336c2ab60e92c247e42d9acddf08316edf
2019-04-09 02:13:26 -07:00
Remi NGUYEN VAN
2535c87d2a Merge "Expose captive portal urls for configuration" am: 55319378ee am: c1704ceaba
am: a6dad121c5

Change-Id: I1f734c5f864bb2f2bc8ba1a66fe33d3480554f69
2019-04-09 02:04:54 -07:00
paulhu
b375738a52 Fix ConnectivityServiceTest fail.
NetdService#getInstance() will get null object in
WrappedConnectivityService constructor. Then pass this null
INetd object to PermissionMonitor will case NPE in
PermissionMonitor#sendPackagePermissionsToNetd()

Bug: 128024100
Test: atest FrameworksNetTests
Change-Id: Ia1c80f9600a19c4aaf3f3c1b497b355d96c49c8e
Merged-In: I7f185e731db91c30a9b0f14aefbdbb067942190e
Merged-In: Ic77ef73841266da487401ffd657ef63562b6fc1e
(cherry picked from commit 7d215078521ea03bbd692364e882d02ad065ced0)
2019-04-09 08:57:08 +00:00
Android Build Merger (Role)
21273659ca Merge "Merge "Address leftover comments on aosp/894233" am: 3753f67bcd am: c4b0483288" into qt-dev-plus-aosp 2019-04-09 06:53:01 +00:00
Chalard Jean
7559529419 Merge "Address leftover comments on aosp/894233" am: 3753f67bcd
am: c4b0483288

Change-Id: Ia08104f839ef37139a8761e2e625bb10c94c275f
2019-04-08 23:52:35 -07:00
Android Build Merger (Role)
c5d65b570e Merge "Merge "Add common tests for FrameworksBaseTests and CTS" into qt-dev am: 29b6be1471" into qt-dev-plus-aosp 2019-04-09 06:50:19 +00:00
Remi NGUYEN VAN
9e1da6068e Merge "Add common tests for FrameworksBaseTests and CTS" into qt-dev
am: 29b6be1471

Change-Id: If7d54cb1cf7f4f271c16cfbdc7629934800fddfc
2019-04-08 23:49:20 -07:00
Anil Admal
7a9206fcdc 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
Merged-In: Ifa60d8f2d60aba4c4e2894dc612c224d45e3992d
Merged-In: Ifa4ec98d5c942522dfd569664f169fa841d495ed
(cherry picked from commit 2eea7ac272431b6e02a0a281207b981b01daf393)
2019-04-09 06:45:57 +00:00
Lorenzo Colitti
cd1fec8907 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
Merged-In: Idf040a67e53d9b9ec6e6c647ce24f8ada501d355
Merged-In: Iad9aea4b42cd8b31a5a2659bb9cb54dd1c64e8b7
(cherry picked from commit 614ab3dd4e49e9b664f5065983fb9067148fef12)
2019-04-09 06:44:32 +00:00
Remi NGUYEN VAN
a6dad121c5 Merge "Expose captive portal urls for configuration" am: 55319378ee
am: c1704ceaba

Change-Id: I54050b28bbfb93e0b7e509dbe0e987a0b902b7d9
2019-04-08 23:40:05 -07:00
Chalard Jean
c4b0483288 Merge "Address leftover comments on aosp/894233"
am: 3753f67bcd

Change-Id: I87f120778b2dc6743edc7fdd4e5390b68de05590
2019-04-08 23:38:53 -07:00
Remi NGUYEN VAN
c1704ceaba Merge "Expose captive portal urls for configuration"
am: 55319378ee

Change-Id: If5970fdafa7c624855ef9d29921542e2fb6fdfa0
2019-04-08 23:29:46 -07:00
Chalard Jean
3753f67bcd Merge "Address leftover comments on aosp/894233" 2019-04-09 05:51:18 +00:00
Remi NGUYEN VAN
29b6be1471 Merge "Add common tests for FrameworksBaseTests and CTS" into qt-dev 2019-04-09 05:16:29 +00:00
Remi NGUYEN VAN
55319378ee Merge "Expose captive portal urls for configuration" 2019-04-09 04:37:48 +00:00
Chalard Jean
ce140af98c Address leftover comments on aosp/894233
Bug: 129510344
Test: m, boots, wifi connects, resolves DNS
Change-Id: Idf24f42a86bbfcc89e3ea8cf50d1b705d72ac613
2019-04-09 12:03:28 +09:00
Benedict Wong
2d9864ab3c Fix remove-before-add for IpSecService RefcountedResource
This patch fixes a bug where if a binder dies before the linkToDeath
call, the cleanup will be performed before the entry is added to the
array. While it is safe in that quotas and tracking performs as per
normal, the RefcountedRecord may not be cleaned up.

Rethrowing this exception is safe, since the only paths that would hit
this are all on binder threads coming from applications. Further, it
seems there is only one real way of this getting hit - if the app that
called the creation died during the binder call.

Bug: 126802451
Test: Compiled, CTS tests passing
Change-Id: I6db75853da9f29e1573512e26351623f22770c5d
2019-04-08 18:51:50 -07:00
Niklas Lindgren
fd6f92eaa2 Expose captive portal urls for configuration
Carriers in Mainland China need to customize certain captive portal
urls. The main issue is that google servers are not accessible in
Mainland China.

Added the following captive portal resources to be targeted for overlay.
- config_captive_portal_http_url
- config_captive_portal_https_url
- config_captive_portal_fallback_urls (string-array)
- config_captive_portal_fallback_probe_specs (string-array)

These values can be customized for e g diffent countries

Bug: 111819230
Test: atest FrameworksNetTests NetworkStackTests
Test: Add a product RRO that targets a specific country code,
insert a SIM card that matches that country code and check the log
what URL is used.
Change-Id: I38a294a5e14417f65e96e76235ea153c53c4d7cc
2019-04-09 10:23:53 +09:00
Remi NGUYEN VAN
78edd3fd8a Merge "[automerger skipped] Merge "Add FrameworksNetTests dependency on libcgrouprc" am: eade5d227d -s ours am: e214f3c72c -s ours
am: 1704d678ff -s ours
am skip reason: change_id Ifcfe4df81caf8ede2e4e66a76552cb3200378fa8 with SHA1 6566d1b82f is in history

Change-Id: If2094e6df4674d0c32f7d79b09b7f182d3284b3f
2019-04-08 16:40:42 -07:00
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