Aaron Huang
434bc5adf4
Merge "Add keepalive related methods and fields to system APIs"
2020-01-10 06:16:04 +00:00
Automerger Merge Worker
cfde6e371c
[automerger skipped] Merge "Fix security problem on PermissionMonitor#hasPermission" into oc-dev am: 5e0b069876 am: 0ebda2d6ca am: be4ef9fe6f -s ours am: d643f69d68 -s ours am: f13799cb24 -s ours am: c47be40b76 -s ours
...
am skip reason: Change-Id Iae9c273af822b18c2e6fce04848a86f8dea6410a with SHA-1 6c93075645 is in history
Change-Id: I1e7d1dfcc789c0a5f801c880c2bbbe8bc6e781d3
2020-01-09 18:32:52 +00:00
Automerger Merge Worker
e213703513
[automerger skipped] Merge "Fix security problem on PermissionMonitor#hasPermission" into pi-dev am: 361f1e97f6 -s ours am: b5933251bc -s ours am: 0135f92c89 -s ours
...
am skip reason: Change-Id I2da730feda4d7ebed1f158b073167bb3964b3e7d with SHA-1 d73f6baa90 is in history
Change-Id: I04970c02f44adbff3c713c81a18840b3d4c2c7d8
2020-01-09 18:32:12 +00:00
Automerger Merge Worker
c47be40b76
[automerger skipped] Merge "Fix security problem on PermissionMonitor#hasPermission" into oc-dev am: 5e0b069876 am: 0ebda2d6ca am: be4ef9fe6f -s ours am: d643f69d68 -s ours am: f13799cb24 -s ours
...
am skip reason: Change-Id Iae9c273af822b18c2e6fce04848a86f8dea6410a with SHA-1 6c93075645 is in history
Change-Id: Id7d778048e411acc447b4adf43d977e8eb98a8af
2020-01-09 17:41:35 +00:00
Automerger Merge Worker
0135f92c89
[automerger skipped] Merge "Fix security problem on PermissionMonitor#hasPermission" into pi-dev am: 361f1e97f6 -s ours am: b5933251bc -s ours
...
am skip reason: Change-Id I2da730feda4d7ebed1f158b073167bb3964b3e7d with SHA-1 d73f6baa90 is in history
Change-Id: I641d8967ec8af4b58696bf2c044f5a87a6836937
2020-01-09 17:40:58 +00:00
Automerger Merge Worker
f13799cb24
[automerger skipped] Merge "Fix security problem on PermissionMonitor#hasPermission" into oc-dev am: 5e0b069876 am: 0ebda2d6ca am: be4ef9fe6f -s ours am: d643f69d68 -s ours
...
am skip reason: Change-Id Iae9c273af822b18c2e6fce04848a86f8dea6410a with SHA-1 6c93075645 is in history
Change-Id: I9b95f9715b7d15e3f430e6c46a2fd975b6b51f23
2020-01-09 16:50:47 +00:00
Automerger Merge Worker
b5933251bc
[automerger skipped] Merge "Fix security problem on PermissionMonitor#hasPermission" into pi-dev am: 361f1e97f6 -s ours
...
am skip reason: Change-Id I2da730feda4d7ebed1f158b073167bb3964b3e7d with SHA-1 d73f6baa90 is in history
Change-Id: Id83288231d705e604e5094d40d211c0c940c4dd4
2020-01-09 16:50:08 +00:00
Automerger Merge Worker
b24adb4bb0
Merge "Add a NetworkProvider class to the SDK." am: 3bd0d010bb am: 4de6a72e85
...
Change-Id: I6f15335ae03674b1b2d759b2bb7b52607eb9e3e0
2020-01-09 15:15:05 +00:00
Lorenzo Colitti
4de6a72e85
Merge "Add a NetworkProvider class to the SDK."
...
am: 3bd0d010bb
Change-Id: If92b0d0e5644f66db3dd17f6b11ff937232c2a90
2020-01-09 07:13:16 -08:00
Lorenzo Colitti
3bd0d010bb
Merge "Add a NetworkProvider class to the SDK."
2020-01-09 15:09:58 +00:00
Automerger Merge Worker
d643f69d68
[automerger skipped] Merge "Fix security problem on PermissionMonitor#hasPermission" into oc-dev am: 5e0b069876 am: 0ebda2d6ca am: be4ef9fe6f -s ours
...
am skip reason: Change-Id Iae9c273af822b18c2e6fce04848a86f8dea6410a with SHA-1 6c93075645 is in history
Change-Id: Ifa87cac191ad07937dc70770ff74a9d025131a40
2020-01-09 14:06:22 +00:00
Automerger Merge Worker
be4ef9fe6f
Merge "Fix security problem on PermissionMonitor#hasPermission" into oc-dev am: 5e0b069876 am: 0ebda2d6ca
...
Change-Id: I5660cafce05a0e3c6edff03bd645d8df329c5d50
2020-01-09 13:53:42 +00:00
Automerger Merge Worker
0ebda2d6ca
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
cf22d1a29f
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
6702d4b5b2
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
9c7a0fa46a
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
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
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
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
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
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
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
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
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
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
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
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
2a55907ecf
Merge changes If28f0be6,If0f80067 am: 96529ad7fc am: 21dd220d3e
...
Change-Id: I3d554c7ac0cf77aa2a80655d77c0e5bfb737dbdc
2020-01-07 07:16:15 +00:00