Commit Graph

4738 Commits

Author SHA1 Message Date
Lorenzo Colitti
c326cedadf Merge changes from topic "networkprovider"
* changes:
  Delete the NetworkFactory running-on-correct-thread assertion.
  Stop using factory serial numbers in NetworkFactory.
  Use NetworkProvider in NetworkFactory.
2020-01-11 03:50:46 +00:00
Automerger Merge Worker
8a299f1fb1 Merge "Add NetworkCapabilities#deduceRestrictedCapability" am: ded6a9e58e am: 804e6f75cd am: 3783516bb3
Change-Id: I9d593d245287362aad82d70ac5fed4d6339f82d7
2020-01-10 09:55:33 +00:00
Automerger Merge Worker
3783516bb3 Merge "Add NetworkCapabilities#deduceRestrictedCapability" am: ded6a9e58e am: 804e6f75cd
Change-Id: I3b07f1715e550568014becb9f987963777da4bba
2020-01-10 09:43:41 +00:00
Treehugger Robot
ded6a9e58e Merge "Add NetworkCapabilities#deduceRestrictedCapability" 2020-01-10 09:27:31 +00:00
Automerger Merge Worker
a013dfc62e Merge "Expose DhcpInfo parcelable interface implementation methods" am: 44780ff920 am: 19c2ed44ea am: 47173f4481
Change-Id: I202ba0c2fe026186c59bb0d7b58d8bb8b5be98c2
2020-01-10 08:42:17 +00:00
Automerger Merge Worker
47173f4481 Merge "Expose DhcpInfo parcelable interface implementation methods" am: 44780ff920 am: 19c2ed44ea
Change-Id: I6bf8b0646d2a9c9df8451feb51b05bf00739c4c3
2020-01-10 08:34:19 +00:00
Aaron Huang
44780ff920 Merge "Expose DhcpInfo parcelable interface implementation methods" 2020-01-10 08:05:24 +00:00
Automerger Merge Worker
61c7ade3a8 Merge "Add keepalive related methods and fields to system APIs" am: b7d665988d am: 23a2ee7ac2
Change-Id: Ie4cd12bb96a42f414d7026828e72eea16f4bd073
2020-01-10 06:31:54 +00:00
Aaron Huang
b7d665988d Merge "Add keepalive related methods and fields to system APIs" 2020-01-10 06:16:04 +00:00
Lorenzo Colitti
9ded26e241 Delete the NetworkFactory running-on-correct-thread assertion.
The change to make NetworkFactory use NetworkProvider included an
assertion that the onNetworkRequested and onRequestWithdrawn
methods were called on the factory's Looper.

This is not really necessary since it cannot happen in the
current code unless there is a bug in Looper. It also makes it
impossible to test this code using TestLooper, which dispatches
messages on the test thread instead of on the looper thread.

So, delete the check.

Bug: 138306002
Test: atest FrameworksWifiTests now passes
Change-Id: I37449efb50287c683312f0b19909bd4c61b38585
2020-01-10 13:53:20 +09:00
Lorenzo Colitti
89a7c62849 Stop using factory serial numbers in NetworkFactory.
Don't delete NetworkFactory.SerialNumber or getSerialNumber() yet
because those are still in use in various places.

Test: builds
Bug: 138306002
Change-Id: I102af09cb52b447e472398869d82556b5708cb82
2020-01-10 13:53:20 +09:00
Lorenzo Colitti
a28c5c928a Use NetworkProvider in NetworkFactory.
Bug: 138306002
Test: builds, boots, wifi and telephony work
Test: Existing NetworkFactory tests in FrameworksNetTests pass
Change-Id: Ib8cac2fab5092c99b0a496fdeedfcfab6d578936
2020-01-10 13:53:20 +09:00
Automerger Merge Worker
a5d7bf75ad Merge "Allow mainline IPsec(IKE) to statically include @PolicyDirection" am: 17d04f08d6 am: b5189ed2d9 am: 6aa3ba16c3
Change-Id: I3c2b6dbe514a9f41d27c71b4f76484d801cb92e8
2020-01-10 00:27:55 +00:00
Automerger Merge Worker
6aa3ba16c3 Merge "Allow mainline IPsec(IKE) to statically include @PolicyDirection" am: 17d04f08d6 am: b5189ed2d9
Change-Id: I40382746ab54ed21fe9d8fc68b2c81bdf2b4e464
2020-01-10 00:16:11 +00:00
Yan Yan
17d04f08d6 Merge "Allow mainline IPsec(IKE) to statically include @PolicyDirection" 2020-01-09 23:42:59 +00:00
Automerger Merge Worker
1ec6418fcf Merge "Add a NetworkProvider class to the SDK." am: f6bbab0f6b am: 80cf87254e am: 62e56d9b36
Change-Id: I7161415a495f9d31762545b5efeb81b387a475cd
2020-01-09 15:33:58 +00:00
Automerger Merge Worker
e022da2fb9 Merge "[SP02] Add provider interfaces to system API" am: 2220f75cdf am: c6487568ad am: 0dc138e8f7
Change-Id: I490c69f902e4b288502adbe5f97c94688147c741
2020-01-09 15:33:22 +00:00
Automerger Merge Worker
62e56d9b36 Merge "Add a NetworkProvider class to the SDK." am: f6bbab0f6b am: 80cf87254e
Change-Id: I6f15335ae03674b1b2d759b2bb7b52607eb9e3e0
2020-01-09 15:15:05 +00:00
Automerger Merge Worker
0dc138e8f7 Merge "[SP02] Add provider interfaces to system API" am: 2220f75cdf am: c6487568ad
Change-Id: I569fbcc38f44221ff1be355e48ced65359f2e70f
2020-01-09 15:14:16 +00:00
Lorenzo Colitti
f6bbab0f6b Merge "Add a NetworkProvider class to the SDK." 2020-01-09 15:09:58 +00:00
Aaron Huang
40a873a6cd 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
ae5cb71b08 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
1835432b46 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
785d0be343 Merge "[SP01] Add NetworkStats to system API" am: a113464439 am: b340068a3e am: e4601e0a58
Change-Id: I1bb272727cbaec0102669b3f3b8141994f8e1f9a
2020-01-09 09:37:50 +00:00
Automerger Merge Worker
e4601e0a58 Merge "[SP01] Add NetworkStats to system API" am: a113464439 am: b340068a3e
Change-Id: I771bf8836f9b754fc05fd743de8cc5a15aecddf1
2020-01-09 09:18:36 +00:00
junyulai
4d905c9e73 [SP02] Add provider interfaces to system API
This change contains a base class that allows external modules
to implement a custom network statistics provider. And a callback
interface that allows the implementation to signal the system.

These interfaces will be used in the follow-up changes that
implement the functionality.

Test: atest FrameworksNetTests CtsUsageStatsTestCases
Test: m doc-comment-check-docs
Bug: 130855321
Change-Id: Ib23377c8b9cef02bc32253462b068fd10734d21a
2020-01-09 08:57:37 +00:00
Junyu Lai
a113464439 Merge "[SP01] Add NetworkStats to system API" 2020-01-09 08:33:24 +00:00
Automerger Merge Worker
a9723b8c44 Merge "Replace ConnectivityManager constants to TetheringManager" am: 0728d22b39 am: 13a0da47dc am: 66ba1fb6aa
Change-Id: I0180fe011062a11d7cc925bced8d8178fa3dcc63
2020-01-09 07:25:42 +00:00
Automerger Merge Worker
66ba1fb6aa Merge "Replace ConnectivityManager constants to TetheringManager" am: 0728d22b39 am: 13a0da47dc
Change-Id: I91a18dbef23d4f3a4b0c068e61e9a236ecae877f
2020-01-09 07:02:23 +00:00
Mark Chien
0728d22b39 Merge "Replace ConnectivityManager constants to TetheringManager" 2020-01-09 06:32:04 +00:00
Sarah Chin
df94694c42 Merge "Handle 5G meteredness in telephony framework" 2020-01-09 05:03:24 +00:00
Automerger Merge Worker
0d49b9f5b7 Merge changes I6260695b,I88f00ca4 am: db9335b832 am: 73a0b2491b
Change-Id: I8d44be12a15d33db6fec6556bf9494ad60fa4c59
2020-01-09 04:22:26 +00:00
junyulai
d27a1725e8 [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
4bcef011b2 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
Sarah Chin
0b7efca5e6 Merge "Handle 5G meteredness in telephony framework" into qt-qpr1-dev-plus-aosp 2020-01-09 02:23:13 +00:00
Chiachang Wang
914a0fff2e Expose NetworkSpecifier methods as SystemApi
Support for Wi-Fi mainline module.

Bug: 135998869
Test: build and make system-api-stubs-docs-update-current-api
Test: atest FrameworksNetTests
Change-Id: I88f00ca4f4cd51c71f7668b34f101fe7d1332c5c
Merged-In: Id705ee0f2b5c464f6d8ccc91f20dcb39dcf6f2b8
2020-01-09 10:22:47 +08:00
Sarah Chin
1431ab2ee5 Handle 5G meteredness in telephony framework
Carriers can set override values via SubscriptionManager.
Added constants and configs for 5G meteredness updates.

Bug: 139070884
Bug: 139218397
Test: atest FrameworksTelephonyTests
Test: atest
cts/tests/tests/telephony/current/src/android/telephony/cts/SubscriptionManagerTest.java

Change-Id: Ic8c5938c4a414ce63303a1fa25af60a0082b1ba9
Merged-In: Ic8c5938c4a414ce63303a1fa25af60a0082b1ba9
(cherry-picked from ag/9302701)
2020-01-09 02:13:47 +00:00
Sarah Chin
e8aa5acef5 Handle 5G meteredness in telephony framework
Carriers can set override values via SubscriptionManager.
Added constants and configs for 5G meteredness updates.

Bug: 139070884
Bug: 139218397
Test: atest FrameworksTelephonyTests
Test: atest
cts/tests/tests/telephony/current/src/android/telephony/cts/SubscriptionManagerTest.java

Change-Id: Ic8c5938c4a414ce63303a1fa25af60a0082b1ba9
Merged-In: Ic8c5938c4a414ce63303a1fa25af60a0082b1ba9
(cherry-picked from ag/9302701)
2020-01-09 02:13:26 +00:00
Automerger Merge Worker
3e5baf453b Merge "Add API surface for ConnectivityDiagnostics API." am: afa0f1756e am: eb3bae3d11 am: 1a7bc730ee
Change-Id: Id7191b7b625a4026feb7f752c7475011a3adbf52
2020-01-08 22:49:23 +00:00
Automerger Merge Worker
1a7bc730ee Merge "Add API surface for ConnectivityDiagnostics API." am: afa0f1756e am: eb3bae3d11
Change-Id: I762ac90f485af3c31afadb249f28363f5a34713f
2020-01-08 22:44:10 +00:00
evitayan
e22e47f48e Allow mainline IPsec(IKE) to statically include @PolicyDirection
@PolicyDirection was hidden API defined in IpSecManager and
mainline module IPsec(IKE) needs to depend on it.

To remove this hidden API dependency, this commit:
- Moves definition of @PolicyDirection to a separate class
- Creates sharing filegroup framework-ike-shared-srcs for mainline
  IKE and include PolicyDirection.java

Bug: 146360859
Test: build, flash, boot
Test: atest FrameworksIkeTests
Change-Id: Ic6d7c06d4b92e16a9a65430365c9acc73932147b
2020-01-08 13:53:14 -08:00
Cody Kesting
afa0f1756e Merge "Add API surface for ConnectivityDiagnostics API." 2020-01-08 21:53:14 +00:00
Automerger Merge Worker
59d58f5cae Merge "Use new UnsupportedAppUsage annotation." am: 9395887931 am: 8081ee1b35
Change-Id: I330594303664e66571a460fdb1a5ab6cb8e5e273
2020-01-08 17:14:42 +00:00
markchien
9e44cdec1d 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
Artur Satayev
33f9217695 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
c1af050435 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
Chiachang Wang
b7af420f03 Expose NetworkSpecifier methods as SystemApi
Support for Wi-Fi mainline module.

Bug: 135998869
Test: build and make system-api-stubs-docs-update-current-api
Test: atest FrameworksNetTests
Change-Id: Id705ee0f2b5c464f6d8ccc91f20dcb39dcf6f2b8
2020-01-08 10:55:50 +08:00
Automerger Merge Worker
3d34af2613 Merge "android.net.http: Update OWNERS." am: 106d798af8 am: 55024898c8 am: 4de1014d6c
Change-Id: Ia627c7ba4ea601fbd44605c6dcc3d80559e2bf93
2020-01-07 14:15:11 +00:00
Automerger Merge Worker
4de1014d6c Merge "android.net.http: Update OWNERS." am: 106d798af8 am: 55024898c8
Change-Id: I3491c6ab0f7591ce3acfe89da8ec976d831da364
2020-01-07 14:02:56 +00:00
Treehugger Robot
106d798af8 Merge "android.net.http: Update OWNERS." 2020-01-07 13:45:20 +00:00