Automerger Merge Worker
d3409a37ae
Merge "Fix security problem on PermissionMonitor#hasPermission" into oc-dev am: 5e0b069876
...
Change-Id: I4c255820617a86afdfa239febdd46fff7d082381
2020-01-09 13:40:20 +00:00
Aaron Huang
a397c7e03a
Expose DhcpInfo parcelable interface implementation methods
...
Parcelable class requires a CREATOR field be exposed.
Bug: 139268426
Bug: 135998869
Test: atest FrameworksNetTests
atest android.net.cts
Change-Id: I41c68406d09014dda99f337add8c0db0298b0582
2020-01-09 21:33:22 +08:00
Lorenzo Colitti
92e6c27592
Add a NetworkProvider class to the SDK.
...
Bug: 138306002
Test: builds, boots, wifi and telephony work
Test: tested by upcoming change that uses this in NetworkFactory
Change-Id: I2f61bf323215b7c6feff8acc92e7434346751773
2020-01-09 19:50:26 +09:00
paulhu
a189a352b8
Add NetworkCapabilities#deduceRestrictedCapability
...
Support telephony mainline module usage.
Bug: 138306002
Test: atest FrameworksNetTests
atest CtsNetTestCases --instant
Change-Id: Idbd9c547eff7227085c753461b901c7cdbe396fb
2020-01-09 17:59:46 +08:00
Automerger Merge Worker
95bccf8d85
Merge "[SP01] Add NetworkStats to system API" am: 0104ecc3b8 am: 08ad8528d7
...
Change-Id: I771bf8836f9b754fc05fd743de8cc5a15aecddf1
2020-01-09 09:18:36 +00:00
Junyu Lai
08ad8528d7
Merge "[SP01] Add NetworkStats to system API"
...
am: 0104ecc3b8
2020-01-09 01:01:49 -08:00
Junyu Lai
0104ecc3b8
Merge "[SP01] Add NetworkStats to system API"
2020-01-09 08:33:24 +00:00
Automerger Merge Worker
32b9e18ca5
Merge "Replace ConnectivityManager constants to TetheringManager" am: 477f778f0b am: e6029da66e
...
Change-Id: I91a18dbef23d4f3a4b0c068e61e9a236ecae877f
2020-01-09 07:02:23 +00:00
Mark Chien
e6029da66e
Merge "Replace ConnectivityManager constants to TetheringManager"
...
am: 477f778f0b
2020-01-08 22:36:55 -08:00
Mark Chien
477f778f0b
Merge "Replace ConnectivityManager constants to TetheringManager"
2020-01-09 06:32:04 +00:00
Automerger Merge Worker
2f598ffa9b
[automerger skipped] Merge "Fix PermissionMonitor issues" into qt-dev am: 97baed2635 am: da3653268c -s ours
...
am skip reason: Change-Id I8b03c9e23ffc9ff46264d6307fb841a7eda76a76 with SHA-1 92079abc2d
2020-01-09 06:10:02 +00:00
Automerger Merge Worker
da3653268c
Merge "Fix PermissionMonitor issues" into qt-dev am: 97baed2635
...
Change-Id: Ia955c4304c2e623b291c111615c65f012b7c3028
2020-01-09 05:59:27 +00:00
Automerger Merge Worker
007afa6763
Merge changes I6260695b,I88f00ca4 am: db9335b832 am: d7a0be5096
...
Change-Id: I8d44be12a15d33db6fec6556bf9494ad60fa4c59
2020-01-09 04:22:26 +00:00
Chiachang Wang
d7a0be5096
Merge changes I6260695b,I88f00ca4
...
am: db9335b832
Change-Id: I550cb7e14d6c9f21a3d87073bcf692e387857cba
2020-01-08 20:03:33 -08:00
junyulai
18c92ac796
[SP01] Add NetworkStats to system API
...
In order to let external module report their network stats,
expose necessary APIs to construct NetworkStats object.
Test: atest FrameworksNetTests CtsUsageStatsTestCases
Test: m doc-comment-check-docs
Bug: 130855321
Change-Id: Id3ec8aaff3df67948c25eac2319a74cf33a27979
2020-01-09 03:11:22 +00:00
Chiachang Wang
a935ddf1f0
Expose clearCapabilities for mainline module
...
Support telephony mainline module usage.
Bug: 138306002
Test: Build and make api-stubs-docs-update-current-api
Change-Id: I6260695b01ec06244d2822f9438a7fae83539ff2
Merged-In: I0a462da4e87cae2c7d4a9b9a92de061a086c5752
2020-01-09 10:25:03 +08:00
Automerger Merge Worker
ac49b2cec7
Merge "Refactor NetworkFactoryInfo to hide implementation details." am: b3fc88fe67 am: 1d5f9da2ba
...
Change-Id: Iaeb14fca8a4a775253494eb783ddcbb83694dc7b
2020-01-09 00:22:45 +00:00
Lorenzo Colitti
1d5f9da2ba
Merge "Refactor NetworkFactoryInfo to hide implementation details."
...
am: b3fc88fe67
2020-01-08 16:19:27 -08:00
Lorenzo Colitti
b3fc88fe67
Merge "Refactor NetworkFactoryInfo to hide implementation details."
2020-01-09 00:10:47 +00:00
Automerger Merge Worker
89f20ee101
Merge "Add API surface for ConnectivityDiagnostics API." am: 4fa27babe0 am: b37d6383db
...
Change-Id: I762ac90f485af3c31afadb249f28363f5a34713f
2020-01-08 22:44:10 +00:00
Cody Kesting
b37d6383db
Merge "Add API surface for ConnectivityDiagnostics API."
...
am: 4fa27babe0
2020-01-08 14:03:24 -08:00
Cody Kesting
4fa27babe0
Merge "Add API surface for ConnectivityDiagnostics API."
2020-01-08 21:53:14 +00:00
Automerger Merge Worker
cb0b62981a
Merge "DO NOT MERGE - Merge January 2020 Security Release into master" am: 50c2cb0d6a am: e35d6b8a36
...
Change-Id: Ia32f0372918ec957fa3eceeb87694759d1531473
2020-01-08 18:10:20 +00:00
Xin Li
e35d6b8a36
Merge "DO NOT MERGE - Merge January 2020 Security Release into master"
...
am: 50c2cb0d6a
2020-01-08 09:57:42 -08:00
Xin Li
50c2cb0d6a
Merge "DO NOT MERGE - Merge January 2020 Security Release into master"
2020-01-08 17:39:17 +00:00
Automerger Merge Worker
41563e13b6
Merge "Use new UnsupportedAppUsage annotation." am: 9395887931 am: f1ac144432
...
Change-Id: I330594303664e66571a460fdb1a5ab6cb8e5e273
2020-01-08 17:14:42 +00:00
Artur Satayev
f1ac144432
Merge "Use new UnsupportedAppUsage annotation."
...
am: 9395887931
Change-Id: If7c0987b098608972ea743649561f5b803ea8d3c
2020-01-08 08:55:00 -08:00
markchien
1f5237045a
Replace ConnectivityManager constants to TetheringManager
...
Replace some ConnectivityManager constants as TetheringManager inside
tethering module. No API change, will have follow up CL to delete
@hide tethering constants in ConnectivityManager and replace caller
to using TetheringManager.
Bug: 144753389
Test: build
Change-Id: Ia1b963669722c32d147375763205ed2f3af52fed
2020-01-08 15:06:09 +00:00
Lorenzo Colitti
a54a1aa47e
Refactor NetworkFactoryInfo to hide implementation details.
...
This is in preparation for introducing NetworkProvider, which
will initially share ConnectivityService code with NetworkFactory.
Bug: 138306002
Test: atest FrameworksNetTests
Change-Id: Ic6f888621f473342ee3fe8fedf9411552111342b
2020-01-08 23:40:42 +09:00
Artur Satayev
0e45d789c1
Use new UnsupportedAppUsage annotation.
...
Existing annotations in libcore/ and frameworks/ will deleted after the migration. This also means that any java library that compiles @UnsupportedAppUsage requires a direct dependency on "unsupportedappusage" java_library.
Bug: 145132366
Test: m && diff unsupportedappusage_index.csv
Change-Id: I0c336de56bc4a041dc97ff9b7927f62f0b44b457
Merged-In: I0c336de56bc4a041dc97ff9b7927f62f0b44b457
2020-01-08 14:04:40 +00:00
Automerger Merge Worker
f4af1273d1
Merge "Add FrameworksNetIntegrationTests to postsubmit" am: 062a4df489 am: 81a121d5b5
...
Change-Id: I9e25954eb1ebe7bfd2525c32d2edb6a8b47a66f1
2020-01-07 13:18:35 +00:00
Remi NGUYEN VAN
81a121d5b5
Merge "Add FrameworksNetIntegrationTests to postsubmit"
...
am: 062a4df489
2020-01-07 05:05:45 -08:00
Remi NGUYEN VAN
062a4df489
Merge "Add FrameworksNetIntegrationTests to postsubmit"
2020-01-07 12:16:34 +00:00
Automerger Merge Worker
69df3dd6c8
Merge "Change tetheroffloadjni to tetheringutilsjni" am: c21a9bcc0e am: ec2f2397ff
...
Change-Id: I913f33213bf208ef7733871222e57a21f0d460e6
2020-01-07 09:25:49 +00:00
markchien
ec2f2397ff
Merge "Change tetheroffloadjni to tetheringutilsjni"
...
am: c21a9bcc0e
2020-01-07 01:12:30 -08:00
Treehugger Robot
c21a9bcc0e
Merge "Change tetheroffloadjni to tetheringutilsjni"
2020-01-07 09:05:43 +00:00
markchien
697fca5c4d
Change tetheroffloadjni to tetheringutilsjni
...
Rename tetheroffloadjni to tetheringutilsjni and move setupRaSocket
jni method from NetUtils into tetheringutilsjni.
Bug: 143195885
Test: -build, flash, boot
-atest TetheringTests
-Off/On hotspot with ipv6 upstream
Change-Id: Ib68eb6999bbe2d3ca97e68712f22b105311ef800
2020-01-07 07:42:13 +00:00
Automerger Merge Worker
b071735cd8
Merge changes If28f0be6,If0f80067 am: 96529ad7fc am: 6df702d3c9
...
Change-Id: I3d554c7ac0cf77aa2a80655d77c0e5bfb737dbdc
2020-01-07 07:16:15 +00:00
Lorenzo Colitti
6df702d3c9
Merge changes If28f0be6,If0f80067
...
am: 96529ad7fc
Change-Id: I108d3c36ce11af544ccfed9291dc38c690724915
2020-01-06 23:03:04 -08:00
Lorenzo Colitti
b32fb84a4b
Make LinkPropertiesTest pass, and fix an NPE.
...
aosp/973686 added the DHCP server address to LinkProperties, but
it did not have any tests, and would throw NPE when parceling a
LinkProperties that did not have a DHCP server.
Add tests and fix the bug.
Bug: 134098566
Test: unit test now passes
Change-Id: If28f0be650963e8d9af7eb53f6940824582a2db3
2020-01-07 13:02:32 +09:00
ruibin zhang
56d4a8aed7
Add the DHCP server address to LinkProperties.
...
Bug: 134098566
Test: see subsequent CL in topic
Change-Id: If0f80067934189137c87cd379e7ae47b187562fd
2020-01-07 01:21:07 +09:00
Remi NGUYEN VAN
cddc9a2621
Add FrameworksNetIntegrationTests to postsubmit
...
After checking flake metrics for this test, it can be added in
presubmit.
Test: this change is to check results in postsubmit
Change-Id: I70cb149629a3e959e29cfd21048e7b148bd29fe9
2020-01-06 22:03:43 +09:00
Automerger Merge Worker
f65cd61f56
Merge "Add permissions for FrameworksNetIntegrationTests" am: eb1eac5931 am: 5d64473716
...
Change-Id: Ied4f6bbefbe81032e3cadca667771b5a64e75304
2020-01-06 05:19:54 +00:00
Paul Hu
5d64473716
Merge "Add permissions for FrameworksNetIntegrationTests"
...
am: eb1eac5931
Change-Id: I27ecd6182ff3794098b6486cb48736df7a849b0e
2020-01-05 21:07:51 -08:00
paulhu
e8fea0957e
Add permissions for FrameworksNetIntegrationTests
...
The protected permissions were changed in some connectivity APIs
since aosp/1099096. Add required permissions for
FrameworksNetIntegrationTests.
Bug: 147121740
Test: atest FrameworksNetIntegrationTests
Change-Id: I38ba5c8e93fd5bc94371b2a02a280f503f2e1367
2020-01-06 09:30:03 +08:00
Cody Kesting
8ddcb9fe40
Add API surface for ConnectivityDiagnostics API.
...
ConnectivityDiagnostics API will be used to provide callbacks to
permissioned applications for notifications on network connectivity
events.
Bug: 143187964
Test: compiles
Change-Id: Ib3c0b93f534a9c540e577891aa8aa0a2ad6de71f
2020-01-02 10:51:17 -08:00
Automerger Merge Worker
231a4ab4fe
Merge "Expose NetworkCapabilities methods to system/public APIs" am: 2b6f4c6dbb am: 990c9b6c8d
...
Change-Id: Id97144cf1421f5256748a196df37f58ffd006859
2019-12-27 08:45:44 +00:00
Aaron Huang
990c9b6c8d
Merge "Expose NetworkCapabilities methods to system/public APIs"
...
am: 2b6f4c6dbb
2019-12-27 00:38:46 -08:00
Aaron Huang
2b6f4c6dbb
Merge "Expose NetworkCapabilities methods to system/public APIs"
2019-12-27 08:32:50 +00:00
Aaron Huang
9572fe28f5
Expose NetworkCapabilities methods to system/public APIs
...
Add methods to system/public APIs for mainline support.
Bug: 139268426
Bug: 135998869
Bug: 138306002
Test: atest FrameworksNetTests
atest NetworkStackTests
./frameworks/opt/net/wifi/tests/wifitests/runtests.sh
atest FrameworksTelephonyTests
atest android.net.cts
atest android.net.wifi.cts
atest android.telephony.cts
Change-Id: I6ec333309172edaf5aa976f83cfbe63512043594
2019-12-27 08:31:06 +00:00
