Commit Graph

6127 Commits

Author SHA1 Message Date
Chalard Jean
394d281c2d Merge "[PT17.5] Revert to booleans for send/not send broadcast constants." am: 9903aea505 am: e2df8e3d63
am: 2429c939f0

Change-Id: I11a1c8daf0355674ea0d9d4d15c6ee95a18e9cf4
2019-03-11 04:40:09 -07:00
Chalard Jean
2429c939f0 Merge "[PT17.5] Revert to booleans for send/not send broadcast constants." am: 9903aea505
am: e2df8e3d63

Change-Id: Iee504061c4b61668990489e70d0dd0b75606d24b
2019-03-11 04:30:54 -07:00
Chalard Jean
e2df8e3d63 Merge "[PT17.5] Revert to booleans for send/not send broadcast constants."
am: 9903aea505

Change-Id: Ib8b991ce89fb94d7f0f8b865a1909f73b0b5be0d
2019-03-11 04:21:36 -07:00
Treehugger Robot
9903aea505 Merge "[PT17.5] Revert to booleans for send/not send broadcast constants." 2019-03-11 11:07:21 +00:00
Chalard Jean
bb4de6cb5b [PT17.5] Revert to booleans for send/not send broadcast constants.
In PT17, for security of the patch these two constants have been
switched from boolean to enum values. While this is nice for making
sure a patch is correct, it's also pretty wasteful. Now that it's
certain that the values of these fields don't matter, they can be
set to logical values (as opposed to reversed as it was the case
before PT17.

Test: runtest
Change-Id: I93a0780e23c2f658687be066dc16f27529baaa86
2019-03-11 15:58:31 +09:00
Sasha Smundak
b803ef4cad Merge "Convert tests/**/Android.mk files to Android.bp" am: a95677ded5 am: e4c53585f3
am: 2d3550e3f3

Change-Id: I55c5f273e09a2a0ad53fdd8cb4860f04207c4241
2019-03-09 08:25:50 -08:00
Luke Huang
17fb1ae03e Merge "Minor changes to the async DNS query JAVA API" am: e11e530257 am: 67de0767d9
am: 0882684893

Change-Id: I5ce24db3888c9ac4e05af254aa99aae3abcb7140
2019-03-09 04:33:13 -08:00
Benedict Wong
eb8cf2cb1d resolve merge conflicts of 40f59e9f2d to master
Bug: None
Test: I solemnly swear I tested this conflict resolution.
Change-Id: Ia76e345ddda5972b2c00731cd1d73a2c1d41c1db
2019-03-08 23:45:49 +00:00
Sasha Smundak
2d3550e3f3 Merge "Convert tests/**/Android.mk files to Android.bp" am: a95677ded5
am: e4c53585f3

Change-Id: Ia1a6c26f4f786f22763ebde95b238887914951f4
2019-03-08 15:33:18 -08:00
Sasha Smundak
e4c53585f3 Merge "Convert tests/**/Android.mk files to Android.bp"
am: a95677ded5

Change-Id: If96014624542d6c99f7d0841347806954dbd4a42
2019-03-08 15:20:09 -08:00
Treehugger Robot
a95677ded5 Merge "Convert tests/**/Android.mk files to Android.bp" 2019-03-08 22:54:11 +00:00
Luke Huang
0882684893 Merge "Minor changes to the async DNS query JAVA API" am: e11e530257
am: 67de0767d9

Change-Id: Ib1e317597d33a460e80a4efc63835754c1c1b3c7
2019-03-08 07:56:33 -08:00
Benedict Wong
40f59e9f2d Merge changes Ie66ba631,Ic42c09a3 am: 9c34c48e96
am: 913412df41

Change-Id: I09e9a64907694c8cf517325da088d70e867e77f2
2019-03-08 07:19:17 -08:00
Luke Huang
67de0767d9 Merge "Minor changes to the async DNS query JAVA API"
am: e11e530257

Change-Id: I96e9325c7dd5396f48b25919a104be55fb9b6346
2019-03-08 06:51:48 -08:00
Benedict Wong
913412df41 Merge changes Ie66ba631,Ic42c09a3
am: 9c34c48e96

Change-Id: I5c8a3364f0244c5945be2bbe919aac2dcc4eba66
2019-03-08 06:35:04 -08:00
markchien
0a6eaab280 Add tethering event callback API
Provide OnTetheringEventCallback for system app to know
tethering's upstream.

Bug: 125583822
Test: -build, flash, boot
      -atest FrameworksNetTests

Change-Id: I7ca81b27c9b805cc01884509f5b20d9d0a24cd36
2019-03-08 17:28:33 +08:00
Luke Huang
e11e530257 Merge "Minor changes to the async DNS query JAVA API" 2019-03-08 03:19:55 +00:00
Varun Anand
d61e4e4e61 [automerger skipped] Merge "Revert "Update VPN capabilities when its underlying network set is null."" into pi-dev am: aa7b93b167 -s ours
am: 53b66bee29 -s ours
am skip reason: change_id Id0abc4d304bb096e92479a118168690ccce634ed with SHA1 273f900b3b is in history

Change-Id: I0fe32cb678b7ee9b7ac79bd0efa4bdec3598ce8b
2019-03-07 17:17:39 -08:00
Varun Anand
53b66bee29 [automerger skipped] Merge "Revert "Update VPN capabilities when its underlying network set is null."" into pi-dev
am: aa7b93b167 -s ours
am skip reason: change_id Id0abc4d304bb096e92479a118168690ccce634ed with SHA1 273f900b3b is in history

Change-Id: I0789a8deb45a949c8734fc317cd3d6d8a452d1d1
2019-03-07 16:21:09 -08:00
Sasha Smundak
168d7631b2 Convert tests/**/Android.mk files to Android.bp
See build/soong/README.md for more information.

Note: tests/ImfTest/Android.mk causes conflict as it hasn't been yet
ported to internal master. Do it later.
Note: the conversion in the following directories has to be done in the
internal master first because of the conflicts:
* tests/ActivityManagerPerfTests
* tests/AppLaunch
* tests/AppLaunchWear
* tests/BackgroundDexOptServiceIntegrationTests
* tests/Camera2Tests/CameraToo
* tests/Camera2Tests/SmartCamera/SimpleCamera
* tests/Compatibility
* tests/Internal
* tests/RcsTests
* tests/ServiceCrashTest
* tests/UsbTests

Bug: 122332340
Test: treehugger
Change-Id: Ie17590c6a96aee5caa80d38092a3de5c1b6efe8d
2019-03-07 16:14:00 -08:00
Benedict Wong
9c34c48e96 Merge changes Ie66ba631,Ic42c09a3
* changes:
  Implement TestNetworkService
  Add shell TestNetworkManager and Service
2019-03-07 23:32:55 +00:00
Mark Chien
0bdfaa802b Merge "Fix TetheringEntitlementValueListener related API" am: e2f15a176f am: 4ccb25bfa3
am: e432b14e7a

Change-Id: I9a1f7c9fa34b6f1e6104a8e5af4b6957e7aae3eb
2019-03-07 05:51:10 -08:00
Mark Chien
e432b14e7a Merge "Fix TetheringEntitlementValueListener related API" am: e2f15a176f
am: 4ccb25bfa3

Change-Id: Id85e5499e15b9b244c212a44ca79587b27c9c016
2019-03-07 05:41:46 -08:00
Mark Chien
4ccb25bfa3 Merge "Fix TetheringEntitlementValueListener related API"
am: e2f15a176f

Change-Id: Idd3a7110c32319b610d5dacad7e3632d759ac887
2019-03-07 05:32:33 -08:00
Mark Chien
e2f15a176f Merge "Fix TetheringEntitlementValueListener related API" 2019-03-07 13:21:53 +00:00
Luke Huang
e083ed951f Minor changes to the async DNS query JAVA API
1. refine the naming in DnsPacket and add more comment
2. add comment in DnsResolver

Test: built, flashed, booted
      atest DnsResolverTest DnsPacketTest

Change-Id: Ib482d079d6823fd1d9bff163427b7aad38374199
2019-03-07 16:40:49 +08:00
Varun Anand
8ddb8a2d84 Revert "Update VPN capabilities when its underlying network set is null."
This reverts commit 5ffc7e609f.

Bug: 126245192

Reason for revert: This change can lead to a deadlock that was fixed in http://ag/6580635. However, platform PMs think that fixing this is risky enough as this is not a recent problem and has been in the field for 3/4 of the year.

Note: The merged-in tag is used to avoid this change from getting merged into pi-dev-plus-aosp. This is to avoid merge conflicts since we mostly work in aosp/master which merges into pi-dev-plus-aosp.

Change-Id: I3814bcec87efb059f50f00617406501aaeac3b4d
Merged-In: Id0abc4d304bb096e92479a118168690ccce634ed
2019-03-07 06:13:03 +00:00
Brett Chabot
b0fcda5054 Merge "Migrate frameworks/base/tests/net/ to androidx.test" am: 216266b524 am: 36e7b25aea
am: 5633b0c200

Change-Id: I01657671712799f5a29a3a7530430cc5bfb14f41
2019-03-06 22:10:32 -08:00
Brett Chabot
5633b0c200 Merge "Migrate frameworks/base/tests/net/ to androidx.test" am: 216266b524
am: 36e7b25aea

Change-Id: I88b55d65728e366e2ffd1336e28da4a879b2d5a2
2019-03-06 22:01:10 -08:00
Brett Chabot
36e7b25aea Merge "Migrate frameworks/base/tests/net/ to androidx.test"
am: 216266b524

Change-Id: Ic6783d55ba6e6a4009569952b542b2a5a42501fe
2019-03-06 21:51:50 -08:00
Treehugger Robot
216266b524 Merge "Migrate frameworks/base/tests/net/ to androidx.test" 2019-03-07 05:42:07 +00:00
markchien
dd41c82056 Fix TetheringEntitlementValueListener related API
Test: -build, flash, boot
      -atest FrameworksNetTests
bug: 126701557
bug: 126392011

Change-Id: I6dda10fbfe8ffaef71269617750a22563396f5ea
2019-03-07 13:33:21 +08:00
Benedict Wong
df87337407 Implement TestNetworkService
This change adds the relevant JNI implementations, as well as the
implementations and NetworkAgent tracking code in the TestNetworkService.

TestNetworkService (And Manager) is designed for use exclusively in
testing code, allowing for the creation of TUN and IPsec backed networks
in test code. Specifically, this allows for testing of components such
as IP, DHCP, or DNS clients, as well as kernel features such as IPsec.

Access to the TestNetworkService will be conditioned upon the
MANAGE_TEST_NETWORKS permission that will be granted only to the Shell.
CTS will use UiAutomation.adoptShellPermissionIdentity() to gain the
ability to use this service.

Bug: 72950854
Test: CTS tests passing
Change-Id: Ie66ba631a548b5f9c6b5ed0797582f86688debe5
2019-03-06 15:37:52 -08:00
Andrei-Valentin Onea
675f787394 [automerger skipped] Merge "Add @UnsupportedAppUsage annotations" am: 298325342e am: 291d748aff
am: 49d90d8b68 -s ours
am skip reason: change_id I7489aad1dceeb18ed7ca48a1ed8829a668b3fa04 with SHA1 734999cff8 is in history

Change-Id: Ic26a760f7e86a4f8e2911bc4d57509bfb574f447
2019-03-06 10:26:13 -08:00
Andrei-Valentin Onea
49d90d8b68 Merge "Add @UnsupportedAppUsage annotations" am: 298325342e
am: 291d748aff

Change-Id: Id5ba379057d3874b78391c312cfb903799617d81
2019-03-06 09:57:27 -08:00
Andrei-Valentin Onea
291d748aff Merge "Add @UnsupportedAppUsage annotations"
am: 298325342e

Change-Id: Ib760897a2d3de2672b4f19d66e238ebee9bfb239
2019-03-06 09:41:34 -08:00
Andrei-Valentin Onea
298325342e Merge "Add @UnsupportedAppUsage annotations" 2019-03-06 17:18:05 +00:00
Brett Chabot
ab11bf1f20 Migrate frameworks/base/tests/net/ to androidx.test
Test: atest FrameworksNetTests
Change-Id: Iaa59d606f5e1678cc5aaca9ed37e184fad894e5d
2019-03-05 09:05:47 -08:00
Varun Anand
2484e523c7 Merge "Fix isActiveNetworkMetered for VPNs." am: 9fd6a19bb0 am: b6b97bb8c3
am: 8f8af9b629

Change-Id: I3d536324052227bbfab31ba5d608c35ecb9b1ab5
2019-03-04 18:09:07 -08:00
Varun Anand
8f8af9b629 Merge "Fix isActiveNetworkMetered for VPNs." am: 9fd6a19bb0
am: b6b97bb8c3

Change-Id: I9a1acc5850245b5c5f0ca13d03f368fb4a0d2fa9
2019-03-04 18:00:27 -08:00
Varun Anand
b6b97bb8c3 Merge "Fix isActiveNetworkMetered for VPNs."
am: 9fd6a19bb0

Change-Id: Ic219c083dffa426a8c6f548ff6a3f4b5c2555217
2019-03-04 17:50:43 -08:00
Varun Anand
9fd6a19bb0 Merge "Fix isActiveNetworkMetered for VPNs." 2019-03-05 01:37:30 +00:00
Amit Mahajan
b66c20f135 Merge "Merge "Adding new APN type for Mission Critical Services." am: c4d867c5e3 am: 819aaec930" into pi-dev-plus-aosp
am: 01eeb382d9

Change-Id: I18dfbcea14211e069fc5698c36e111c89abfc3ac
2019-03-04 11:36:09 -08:00
Amit Mahajan
ec9e7a07e9 Merge "Adding new APN type for Mission Critical Services." am: c4d867c5e3 am: 819aaec930
am: 508c836dd5

Change-Id: Iaa216ae164b1bbc1c27be0549bd9e19fa9803cb8
2019-03-04 11:10:07 -08:00
Android Build Merger (Role)
01eeb382d9 Merge "Merge "Adding new APN type for Mission Critical Services." am: c4d867c5e3 am: 819aaec930" into pi-dev-plus-aosp 2019-03-04 19:03:21 +00:00
Amit Mahajan
4b09a183c7 Merge "Adding new APN type for Mission Critical Services." am: c4d867c5e3
am: 819aaec930

Change-Id: Iab925fcbad4dd505021c4bf5345a4b2714f2fba3
2019-03-04 11:02:30 -08:00
Amit Mahajan
508c836dd5 Merge "Adding new APN type for Mission Critical Services." am: c4d867c5e3
am: 819aaec930

Change-Id: I374b11d4300e31aea7143307f1e8b9eb4c300ae1
2019-03-04 10:54:19 -08:00
Amit Mahajan
819aaec930 Merge "Adding new APN type for Mission Critical Services."
am: c4d867c5e3

Change-Id: I4ae43791c9444f792d69e27b76a5bf57f8dfb4c8
2019-03-04 10:43:30 -08:00
Amit Mahajan
c4d867c5e3 Merge "Adding new APN type for Mission Critical Services." 2019-03-04 18:23:30 +00:00
Mark Chien
37e20d0a1d Merge "Return not supported if no necessary socket option" am: 719b872bfe am: 857c29a147
am: f641f82feb

Change-Id: I46918a026f547ebd8a001a1e4dba2881cf6dd134
2019-03-04 01:46:47 -08:00