Automerger Merge Worker
d64d982de9
Merge "[SP01] Add NetworkStats to system API" am: c494e23773 am: 02a936a9ad am: 2687f35f34
...
Change-Id: I1bb272727cbaec0102669b3f3b8141994f8e1f9a
2020-01-09 09:37:50 +00:00
Automerger Merge Worker
2687f35f34
Merge "[SP01] Add NetworkStats to system API" am: c494e23773 am: 02a936a9ad
...
Change-Id: I771bf8836f9b754fc05fd743de8cc5a15aecddf1
2020-01-09 09:18:36 +00:00
Junyu Lai
02a936a9ad
Merge "[SP01] Add NetworkStats to system API"
...
am: c494e23773
Change-Id: Ie9e97a16bbe221f42cff73bba59e9fc8404db551
2020-01-09 01:01:49 -08:00
Junyu Lai
c494e23773
Merge "[SP01] Add NetworkStats to system API"
2020-01-09 08:33:24 +00:00
Automerger Merge Worker
20c3474d81
Merge "Replace ConnectivityManager constants to TetheringManager" am: 8124da436a am: ced6412599 am: 023c3b47b0
...
Change-Id: I0180fe011062a11d7cc925bced8d8178fa3dcc63
2020-01-09 07:25:42 +00:00
Automerger Merge Worker
023c3b47b0
Merge "Replace ConnectivityManager constants to TetheringManager" am: 8124da436a am: ced6412599
...
Change-Id: I91a18dbef23d4f3a4b0c068e61e9a236ecae877f
2020-01-09 07:02:23 +00:00
Mark Chien
ced6412599
Merge "Replace ConnectivityManager constants to TetheringManager"
...
am: 8124da436a
Change-Id: I7994991ac24f4e3ce753e55976b4b5e70b31539f
2020-01-08 22:36:55 -08:00
Mark Chien
8124da436a
Merge "Replace ConnectivityManager constants to TetheringManager"
2020-01-09 06:32:04 +00:00
Automerger Merge Worker
f2072395f2
[automerger skipped] Merge "Fix PermissionMonitor issues" into qt-dev am: 97baed2635 am: 4d81cf1c51 -s ours am: f8771ad461 -s ours
...
am skip reason: Change-Id I8b03c9e23ffc9ff46264d6307fb841a7eda76a76 with SHA-1 36872f15f5 is in history
Change-Id: I972cb163c648ff9f426402dfee041a0ebd31f8ec
2020-01-09 06:24:07 +00:00
Automerger Merge Worker
f8771ad461
[automerger skipped] Merge "Fix PermissionMonitor issues" into qt-dev am: 97baed2635 am: 4d81cf1c51 -s ours
...
am skip reason: Change-Id I8b03c9e23ffc9ff46264d6307fb841a7eda76a76 with SHA-1 36872f15f5 is in history
Change-Id: Ib3e46e93903aa5c923faed520d240d04e3154a91
2020-01-09 06:10:02 +00:00
Automerger Merge Worker
4d81cf1c51
Merge "Fix PermissionMonitor issues" into qt-dev am: 97baed2635
...
Change-Id: Ia955c4304c2e623b291c111615c65f012b7c3028
2020-01-09 05:59:27 +00:00
Automerger Merge Worker
2dc5dab51a
[automerger skipped] Merge changes I6260695b,I88f00ca4 am: db9335b832 am: 637ea71e2c am: 03f40f36eb -s ours
...
am skip reason: Change-Id I0a462da4e87cae2c7d4a9b9a92de061a086c5752 with SHA-1 7879adc8b1 is in history
Change-Id: I9486a6519b3ff53ed834ef6367ed62911b2e6bef
2020-01-09 04:38:38 +00:00
Automerger Merge Worker
03f40f36eb
Merge changes I6260695b,I88f00ca4 am: db9335b832 am: 637ea71e2c
...
Change-Id: I8d44be12a15d33db6fec6556bf9494ad60fa4c59
2020-01-09 04:22:26 +00:00
Chiachang Wang
637ea71e2c
Merge changes I6260695b,I88f00ca4
...
am: db9335b832
Change-Id: I550cb7e14d6c9f21a3d87073bcf692e387857cba
2020-01-08 20:03:33 -08:00
junyulai
9b292c2c1f
[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
c2441ee239
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
633de0a018
Merge "Refactor NetworkFactoryInfo to hide implementation details." am: fd21b50332 am: e4801d5f6d am: fc09f37c70
...
Change-Id: I58cc18e279a6376256e99d24df83583293a89fc0
2020-01-09 00:39:49 +00:00
Automerger Merge Worker
fc09f37c70
Merge "Refactor NetworkFactoryInfo to hide implementation details." am: fd21b50332 am: e4801d5f6d
...
Change-Id: Iaeb14fca8a4a775253494eb783ddcbb83694dc7b
2020-01-09 00:22:45 +00:00
Lorenzo Colitti
e4801d5f6d
Merge "Refactor NetworkFactoryInfo to hide implementation details."
...
am: fd21b50332
Change-Id: Ide91a79a0d817efe408b9f85860178c9975a63bd
2020-01-08 16:19:27 -08:00
Lorenzo Colitti
fd21b50332
Merge "Refactor NetworkFactoryInfo to hide implementation details."
2020-01-09 00:10:47 +00:00
Automerger Merge Worker
0f44319e8a
Merge "Add API surface for ConnectivityDiagnostics API." am: 33bb594563 am: 30f5bec382 am: b432ef87d2
...
Change-Id: Id7191b7b625a4026feb7f752c7475011a3adbf52
2020-01-08 22:49:23 +00:00
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