Lorenzo Colitti
8dd13a8109
Rename NetworkMisc to NetworkAgentConfig.
...
NetworkMisc is not really an appropriate name for a system API.
Bug: 138306002
Test: builds, boots, wifi works, telephony works
Test: atest FrameworksNetTests FrameworksWifiTests FrameworksTelephonyTests
Change-Id: I621cfbe165996c67b201ca2dd2f95a5ab9af10ee
2020-01-13 15:01:52 +09:00
Lorenzo Colitti
c58ecd5f33
Make NetworkAgent stop subclassing Handler.
...
Subclassing Handler is not appropriate for a system API because
it is an implementation detail and allows users of this class to
post messages to the handler in ways that allow inappropriate
access to internals that aren't part of the API contract.
Also fix some lint errors.
Test: builds
Bug: 138306002
Change-Id: I79478ceff6bbcae879d1025098d177de0d15dbee
2020-01-13 14:49:15 +09:00
Automerger Merge Worker
8ae3471952
Merge changes I7ea39b80,I6b9979f3 am: 310d1dac0d am: 3efc93af3d am: 243e5f21ea
...
Change-Id: I97bd2471b04d9a6291b03a989ccd618c2dc70c6e
2020-01-13 04:51:33 +00:00
Automerger Merge Worker
243e5f21ea
Merge changes I7ea39b80,I6b9979f3 am: 310d1dac0d am: 3efc93af3d
...
Change-Id: If8cd7bd2c1fe4b698113eb761ed8e2b4f9580cf0
2020-01-13 04:34:10 +00:00
Lorenzo Colitti
3efc93af3d
Merge changes I7ea39b80,I6b9979f3
...
am: 310d1dac0d
Change-Id: I33b163077fcc270f79a11a43e481767934e8ac9e
2020-01-12 20:19:21 -08:00
Lorenzo Colitti
a86fae785a
Stop using NetworkFactory in connectivity code.
...
Bug: 138306002
Test: builds, boots
Test: atest FrameworksNetTests
Change-Id: I6b9979f343108c0c077abd86ae1c21e5ece0cccc
2020-01-12 17:40:02 +09:00
Automerger Merge Worker
934e051607
Merge "Add NetworkCapabilities#deduceRestrictedCapability" am: 0e82d1c50d am: 2d976e6c9e am: 02ee974ee1
...
Change-Id: I9d593d245287362aad82d70ac5fed4d6339f82d7
2020-01-10 09:55:33 +00:00
Automerger Merge Worker
02ee974ee1
Merge "Add NetworkCapabilities#deduceRestrictedCapability" am: 0e82d1c50d am: 2d976e6c9e
...
Change-Id: I3b07f1715e550568014becb9f987963777da4bba
2020-01-10 09:43:41 +00:00
paulhu
2d976e6c9e
Merge "Add NetworkCapabilities#deduceRestrictedCapability"
...
am: 0e82d1c50d
Change-Id: I3c451ed7725cacd5672e7b1920a0725239015e68
2020-01-10 01:32:25 -08:00
Treehugger Robot
0e82d1c50d
Merge "Add NetworkCapabilities#deduceRestrictedCapability"
2020-01-10 09:27:31 +00:00
Automerger Merge Worker
f82ab34c40
Merge "Expose DhcpInfo parcelable interface implementation methods" am: 617e9bd709 am: 6817693ef3 am: badb0c36b6
...
Change-Id: I202ba0c2fe026186c59bb0d7b58d8bb8b5be98c2
2020-01-10 08:42:17 +00:00
Automerger Merge Worker
badb0c36b6
Merge "Expose DhcpInfo parcelable interface implementation methods" am: 617e9bd709 am: 6817693ef3
...
Change-Id: I6bf8b0646d2a9c9df8451feb51b05bf00739c4c3
2020-01-10 08:34:19 +00:00
Aaron Huang
6817693ef3
Merge "Expose DhcpInfo parcelable interface implementation methods"
...
am: 617e9bd709
Change-Id: Ie432bee8641bd0c2e94adb04329ea6e80e8ed72c
2020-01-10 00:10:03 -08:00
Aaron Huang
617e9bd709
Merge "Expose DhcpInfo parcelable interface implementation methods"
2020-01-10 08:05:24 +00:00
Automerger Merge Worker
1b0585bb81
[automerger skipped] Merge "Add keepalive related methods and fields to system APIs" am: 434bc5adf4 am: 57e9fd7e5a am: 6e6fd92d08 -s ours
...
am skip reason: Change-Id I2d982e8abb5cb6b4c74a20483550b18cf814320d with SHA-1 5a916810c6 is in history
Change-Id: Iac4c0a4c7d56693fe3505336c007565ac3ce76f8
2020-01-10 06:43:56 +00:00
Automerger Merge Worker
6e6fd92d08
Merge "Add keepalive related methods and fields to system APIs" am: 434bc5adf4 am: 57e9fd7e5a
...
Change-Id: Ie4cd12bb96a42f414d7026828e72eea16f4bd073
2020-01-10 06:31:54 +00:00
Aaron Huang
57e9fd7e5a
Merge "Add keepalive related methods and fields to system APIs"
...
am: 434bc5adf4
Change-Id: Ic557c3ece7b443124ca050e6c6bfd3a1f2d77c3b
2020-01-09 22:20:39 -08:00
Aaron Huang
434bc5adf4
Merge "Add keepalive related methods and fields to system APIs"
2020-01-10 06:16:04 +00:00
Automerger Merge Worker
808d56c5dd
[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: cfde6e371c -s ours
...
am skip reason: Change-Id I8a1575dedd6e3b7a8b60ee2ffd475d790aec55c4 with SHA-1 f988293d3c is in history
Change-Id: I4214af1569adfad7a376fe95fffc6127dcc3a223
2020-01-09 19:05:30 +00:00
Automerger Merge Worker
d9c06868b6
[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: e213703513 -s ours
...
am skip reason: Change-Id I8a1575dedd6e3b7a8b60ee2ffd475d790aec55c4 with SHA-1 f988293d3c is in history
Change-Id: I5b65a90ca11912a369680f58d82d22e381f110ca
2020-01-09 19:04:44 +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
5c058b526c
Merge "Add a NetworkProvider class to the SDK." am: 3bd0d010bb am: 4de6a72e85 am: b24adb4bb0
...
Change-Id: I7161415a495f9d31762545b5efeb81b387a475cd
2020-01-09 15:33:58 +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
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