Automerger Merge Worker
b432ef87d2
Merge "Add API surface for ConnectivityDiagnostics API." am: 33bb594563 am: 30f5bec382
...
Change-Id: I762ac90f485af3c31afadb249f28363f5a34713f
2020-01-08 22:44:10 +00:00
Cody Kesting
30f5bec382
Merge "Add API surface for ConnectivityDiagnostics API."
...
am: 33bb594563
Change-Id: I1661e0c1f73a2081ac19e6cca2b1128d4917de90
2020-01-08 14:03:24 -08:00
Cody Kesting
33bb594563
Merge "Add API surface for ConnectivityDiagnostics API."
2020-01-08 21:53:14 +00:00
Automerger Merge Worker
0ce9906755
[automerger skipped] Merge "DO NOT MERGE - Merge January 2020 Security Release into master" am: d48bb1d764 am: 5f24bc2edf am: 0c2cd972a3 -s ours
...
am skip reason: subject contains skip directive
Change-Id: I5dcf181ed436646862256997564e156d6a595a85
2020-01-08 18:25:45 +00:00
Automerger Merge Worker
0c2cd972a3
Merge "DO NOT MERGE - Merge January 2020 Security Release into master" am: d48bb1d764 am: 5f24bc2edf
...
Change-Id: Ia32f0372918ec957fa3eceeb87694759d1531473
2020-01-08 18:10:20 +00:00
Xin Li
5f24bc2edf
Merge "DO NOT MERGE - Merge January 2020 Security Release into master"
...
am: d48bb1d764
Change-Id: I4d10705027866ea946f5529166dd6f67aec9e332
2020-01-08 09:57:42 -08:00
Xin Li
d48bb1d764
Merge "DO NOT MERGE - Merge January 2020 Security Release into master"
2020-01-08 17:39:17 +00:00
Automerger Merge Worker
c8a99be103
[automerger skipped] Merge "Use new UnsupportedAppUsage annotation." am: 9395887931 am: b45dabd0ee am: 99035109e5 -s ours
...
am skip reason: Change-Id I0c336de56bc4a041dc97ff9b7927f62f0b44b457 with SHA-1 53dac33c7e is in history
Change-Id: I5d5027d9a3ae3c7451b5bff629c0af0902b78a32
2020-01-08 17:25:23 +00:00
Automerger Merge Worker
99035109e5
Merge "Use new UnsupportedAppUsage annotation." am: 9395887931 am: b45dabd0ee
...
Change-Id: I330594303664e66571a460fdb1a5ab6cb8e5e273
2020-01-08 17:14:42 +00:00
Artur Satayev
b45dabd0ee
Merge "Use new UnsupportedAppUsage annotation."
...
am: 9395887931
Change-Id: If7c0987b098608972ea743649561f5b803ea8d3c
2020-01-08 08:55:00 -08:00
markchien
a0f8fd92fd
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
78185eae90
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
9c2add6fcc
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
Chiachang Wang
7879adc8b1
Expose clearCapabilities for mainline module
...
Support telephony mainline module usage.
Bug: 138306002
Test: Build and make api-stubs-docs-update-current-api
Change-Id: I0a462da4e87cae2c7d4a9b9a92de061a086c5752
2020-01-08 11:08:10 +08:00
Automerger Merge Worker
b8a9e8689c
Merge "Add FrameworksNetIntegrationTests to postsubmit" am: 9a00f5be3b am: f4767ccfc0 am: 3ab3ff6156
...
Change-Id: Ia0068ec43a68330d97a7c8067e5a5aec5356fad9
2020-01-07 13:30:19 +00:00
Automerger Merge Worker
3ab3ff6156
Merge "Add FrameworksNetIntegrationTests to postsubmit" am: 9a00f5be3b am: f4767ccfc0
...
Change-Id: I9e25954eb1ebe7bfd2525c32d2edb6a8b47a66f1
2020-01-07 13:18:35 +00:00
Remi NGUYEN VAN
f4767ccfc0
Merge "Add FrameworksNetIntegrationTests to postsubmit"
...
am: 9a00f5be3b
Change-Id: I3384970a0a961dfaaf10229ed9e5d39c4f552256
2020-01-07 05:05:45 -08:00
Remi NGUYEN VAN
9a00f5be3b
Merge "Add FrameworksNetIntegrationTests to postsubmit"
2020-01-07 12:16:34 +00:00
Automerger Merge Worker
d35146155f
Merge "Change tetheroffloadjni to tetheringutilsjni" am: 0af9d37eca am: d248c13bda am: e7294ecb17
...
Change-Id: I2069561edb05b53e565563c8419c689531ff9571
2020-01-07 09:38:44 +00:00
Automerger Merge Worker
e7294ecb17
Merge "Change tetheroffloadjni to tetheringutilsjni" am: 0af9d37eca am: d248c13bda
...
Change-Id: I913f33213bf208ef7733871222e57a21f0d460e6
2020-01-07 09:25:49 +00:00
markchien
d248c13bda
Merge "Change tetheroffloadjni to tetheringutilsjni"
...
am: 0af9d37eca
Change-Id: I48207d95cf6f512ec038fb5dc9ba4009c01d676d
2020-01-07 01:12:30 -08:00
Treehugger Robot
0af9d37eca
Merge "Change tetheroffloadjni to tetheringutilsjni"
2020-01-07 09:05:43 +00:00
TreeHugger Robot
bf954f0c42
Merge "Use new UnsupportedAppUsage annotation."
2020-01-07 07:58:18 +00:00
markchien
d53edf736f
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
46ea41c701
Merge changes If28f0be6,If0f80067 am: 96529ad7fc am: 21dd220d3e am: 2a55907ecf
...
Change-Id: I826f1f94ea62eb5bd93e5d7edcbe278c8247ae2d
2020-01-07 07:31:36 +00:00
Automerger Merge Worker
2a55907ecf
Merge changes If28f0be6,If0f80067 am: 96529ad7fc am: 21dd220d3e
...
Change-Id: I3d554c7ac0cf77aa2a80655d77c0e5bfb737dbdc
2020-01-07 07:16:15 +00:00
Lorenzo Colitti
21dd220d3e
Merge changes If28f0be6,If0f80067
...
am: 96529ad7fc
Change-Id: I108d3c36ce11af544ccfed9291dc38c690724915
2020-01-06 23:03:04 -08:00
Lorenzo Colitti
279a1d6620
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
Artur Satayev
53dac33c7e
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
2020-01-06 16:47:35 +00:00
ruibin zhang
ca75bc897d
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
TreeHugger Robot
dc3b592193
Merge "Add NETWORK_AIRPLANE_MODE permission"
2020-01-06 14:15:46 +00:00
Remi NGUYEN VAN
0b197df422
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
29acd4b104
Merge "Merge "Add permissions for FrameworksNetIntegrationTests" am: eb1eac5931 am: 5263193189" into qt-qpr1-dev-plus-aosp am: 68c7733ebe
...
Change-Id: If2d58d553dacfa675638b215df4b17bd96e3b9bb
2020-01-06 05:30:46 +00:00
Automerger Merge Worker
94cf06f1db
Merge "Add permissions for FrameworksNetIntegrationTests" am: eb1eac5931 am: 5263193189
...
Change-Id: Ied4f6bbefbe81032e3cadca667771b5a64e75304
2020-01-06 05:19:54 +00:00
Paul Hu
5263193189
Merge "Add permissions for FrameworksNetIntegrationTests"
...
am: eb1eac5931
Change-Id: I27ecd6182ff3794098b6486cb48736df7a849b0e
2020-01-05 21:07:51 -08:00
paulhu
6c3b3a494f
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
Daulet Zhanguzin
d4e7dd113d
Replace com.android.internal.util.Preconditions.checkNotNull with
...
java.util.Objects.requireNonNull
Bug: 126528330
Test: Treehugger
Exempt-From-Owner-Approval: Global refactoring.
Change-Id: Idb1b6ba41af3b52f3376b1157259af3c30328c4e
2020-01-03 17:53:30 +00:00
Cody Kesting
457a1ad289
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
467942cf30
Merge "Expose NetworkCapabilities methods to system/public APIs" am: 9290dc1179 am: 5d77a84faf am: bd94fca597
...
Change-Id: I6515df858f4ebc94d234f905a659db45188d72c6
2019-12-27 08:54:24 +00:00
Automerger Merge Worker
bd94fca597
Merge "Expose NetworkCapabilities methods to system/public APIs" am: 9290dc1179 am: 5d77a84faf
...
Change-Id: Id97144cf1421f5256748a196df37f58ffd006859
2019-12-27 08:45:44 +00:00
Aaron Huang
5d77a84faf
Merge "Expose NetworkCapabilities methods to system/public APIs"
...
am: 9290dc1179
Change-Id: Icb3d0559475a14130dea64a5ca49a6259d5a2eb9
2019-12-27 00:38:46 -08:00
Aaron Huang
9290dc1179
Merge "Expose NetworkCapabilities methods to system/public APIs"
2019-12-27 08:32:50 +00:00
Aaron Huang
e435d2aeb1
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
Automerger Merge Worker
a05cd2e774
Merge "Remove tlsFingerprints init value" am: 2a479ab133 am: 28112be9d7 am: 7a377fcbd9
...
Change-Id: I07a79a786b6847f49859ca04783effd45043d1f6
2019-12-26 07:41:00 +00:00
Automerger Merge Worker
7a377fcbd9
Merge "Remove tlsFingerprints init value" am: 2a479ab133 am: 28112be9d7
...
Change-Id: I5f5948c707abf2eb3c301d6eb8b63e867acd6e05
2019-12-26 07:26:08 +00:00
Wayne Ma
28112be9d7
Merge "Remove tlsFingerprints init value"
...
am: 2a479ab133
Change-Id: Ib29fe2d356c6faab809d95233f0b9771a6053191
2019-12-25 23:15:59 -08:00
Wayne Ma
2a479ab133
Merge "Remove tlsFingerprints init value"
2019-12-26 07:13:05 +00:00
Automerger Merge Worker
d744a6bddf
[automerger skipped] Merge "[Tether13] Move TetheringManager into framework" am: 2410d67357 am: fc8e151780 am: 9e13b3c8d7 -s ours
...
am skip reason: Change-Id Ib051bea724a256f9c4572b566e46ae7b9c4abe6e with SHA-1 be9b5e5eea is in history
Change-Id: Id5b74e1af8e1a4276137b4f3eb3d8ffc1a2c903c
2019-12-20 14:13:17 +00:00
Automerger Merge Worker
9e13b3c8d7
Merge "[Tether13] Move TetheringManager into framework" am: 2410d67357 am: fc8e151780
...
Change-Id: I9ec25eb984e3b534ddcc9313836a319b21526998
2019-12-20 14:00:29 +00:00
Mark Chien
fc8e151780
Merge "[Tether13] Move TetheringManager into framework"
...
am: 2410d67357
Change-Id: I05c79a1cf07e7679ea2a2c9221e541fb1c9a5a23
2019-12-20 05:47:01 -08:00