Commit Graph

4544 Commits

Author SHA1 Message Date
Sarah Chin
11c0ef2c5e Merge "5G meteredness for telephony framework" 2019-10-14 23:31:42 +00:00
Chalard Jean
ef55c5f078 Merge "Improve documentation for NetworkCallbacks." am: 90a84e26bd am: cf03f69025 am: cbdc9a1e48
am: 8ec5f5b53b

Change-Id: I9a6eb4841c29e6e6944e3bb6eeb036f8026db4cf
2019-10-09 23:34:18 -07:00
Chalard Jean
cf03f69025 Merge "Improve documentation for NetworkCallbacks."
am: 90a84e26bd

Change-Id: I7384a0224bdf3fe86aee3733d4b7a6e5e12b5a4e
2019-10-09 23:14:30 -07:00
Chalard Jean
90a84e26bd Merge "Improve documentation for NetworkCallbacks." 2019-10-10 05:56:59 +00:00
Chalard Jean
599ce75792 Improve documentation for NetworkCallbacks.
Bug: 139570489
Test: m doc-comment-check-docs
Change-Id: I9e13057b7e46908863156986429ff2ce93d4be78
2019-10-09 18:33:09 +09:00
Sarah Chin
7af1fd0376 5G meteredness for telephony framework
Added networkTypes to SubscriptionPlan
Send SubscriptionPlans as dispatch via listener
Updated API for R

Bug: 139070884
Test: atest FrameworksTelephonyTests
Test: atest cts/tests/tests/telephony/current/src/android/telephony/cts/SubscriptionManagerTest.java
Change-Id: Idb67fb7676adf9e1158113e7b8b08e655f470920
2019-10-08 20:09:37 -07:00
Valentin Iftime
67d9805fed resolve merge conflicts of 484e166df3 to master
Test: I solemnly swear I tested this conflict resolution.
Bug: None
Change-Id: Ia9db1400207d9196012362c480ede059e94184af
2019-10-08 22:21:44 +02:00
Iavor-Valentin Iftime
99d866acff Merge "API to detect which network interfaces support wake-on-lan"
am: 311fc569f3

Change-Id: I6239ae68559290e31f8c9384e0f973cfea30a1c7
2019-10-08 08:23:23 -07:00
Valentin Iftime
c86ebbaebc API to detect which network interfaces support wake-on-lan
Add a new method in LinkProperties, isWakeOnLanEnabled() which returns
true if network interface is defined in config_wakeonlan_enabled_interfaces
string-array (config.xml)

Bug: 132705025
Test: atest LinkPropertiesTest & atest ConnectivityServiceTest
Change-Id: I3f7803aafd2f8eaf8aa18419b21339e15d4b7a0b
2019-10-08 13:03:30 +02:00
Oscar Shu
e90660540a Merge "Followup to CL 1103896" am: 54bb8a1625 am: 23d581fe2c am: 7015d3f756
am: 61c79ad6a9

Change-Id: I9aec9d7481722e2533200dcab9bc9066142496a1
2019-09-24 16:06:25 -07:00
Oscar Shu
23d581fe2c Merge "Followup to CL 1103896"
am: 54bb8a1625

Change-Id: I1eb784a8266880260d75ca109c7d78f180333a0e
2019-09-24 15:28:23 -07:00
Oscar Shu
54bb8a1625 Merge "Followup to CL 1103896" 2019-09-24 22:06:27 +00:00
xshu
b483607abe Followup to CL 1103896
Optimizes the logic that ensures the default randomized MAC is not
returned.

Bug: 137796328
Test: atest MacAddressTest
Change-Id: Ie95d7a020bfac8850b8a67e4d396de77db22e1db
2019-09-20 16:56:54 -07:00
TreeHugger Robot
ad324a3d7e Merge "Merge qt-r1-dev-plus-aosp-without-vendor (5817612) into stage-aosp-master" into stage-aosp-master 2019-09-11 20:31:32 +00:00
Christian Wailes
27a81b813c Merge "Revert "Revert "Remove a misleading "flush" function.""" am: d9bce3cfff am: 80743ffc07 am: 172d31f847
am: c21292127e

Change-Id: Iac008022e596a908f125f2a8a0ce57697cc65b51
2019-09-11 13:09:53 -07:00
Christian Wailes
172d31f847 Merge "Revert "Revert "Remove a misleading "flush" function.""" am: d9bce3cfff
am: 80743ffc07

Change-Id: I4f3f8f6e600a6902766e9075cfc9aa4cff61d930
2019-09-11 12:24:29 -07:00
Christian Wailes
d9bce3cfff Merge "Revert "Revert "Remove a misleading "flush" function.""" 2019-09-11 18:23:50 +00:00
Xin Li
d57e959e71 Merge qt-r1-dev-plus-aosp-without-vendor (5817612) into stage-aosp-master
Bug: 135460123
Change-Id: I65906d82b14125c0893d5cde0cfebb73bf9e38ab
Merged-In: I1f2564837c33cd4c6c3db6aac3cbaf8c09707da9
2019-09-10 11:16:29 -07:00
Christian Wailes
647fee87dc Revert "Revert "Remove a misleading "flush" function.""
This reverts commit 47da177405.

Reason for revert: Fixed the test broken by the original commit

Bug: 139192244
Bug: 140336855

Test: m -> flash -> boot
Test: atest CtsJvmtiAttachingHostTestCases

Change-Id: I4c67ad8709652c4710ef24564e0240f74f817f8c
2019-09-04 23:37:32 +00:00
Ian Kasprzak
466a5b9eea Merge "Merge "Revert "Remove a misleading "flush" function."" am: 9fcf8b7cae am: 783313acbf am: 013c618a41 am: b2a36aefa9" into qt-qpr1-dev-plus-aosp
am: 6399a34a4d

Change-Id: I72fcccb65b8ac0eee37ea7fedb5aa6a10fab23bc
2019-09-03 16:03:09 -07:00
Ian Kasprzak
b2a36aefa9 Merge "Revert "Remove a misleading "flush" function."" am: 9fcf8b7cae am: 783313acbf
am: 013c618a41

Change-Id: Icd583aced1fd57444a5194db9ba2644f9862d1a9
2019-09-02 09:05:31 -07:00
Ian Kasprzak
783313acbf Merge "Revert "Remove a misleading "flush" function.""
am: 9fcf8b7cae

Change-Id: Ic6fafd4ed9bf6dfc001120dced903b14cf907d1d
2019-09-02 08:47:30 -07:00
Ian Kasprzak
9fcf8b7cae Merge "Revert "Remove a misleading "flush" function."" 2019-09-02 15:28:20 +00:00
Ian Kasprzak
47da177405 Revert "Remove a misleading "flush" function."
This reverts commit 9d8b926859.

Reason for revert: Driodcop: aosp-master test-mapping showing multiple failures (b/140336855).

Change-Id: If44e273dd111802db8b44db1e5a67a4628c72e3c
2019-08-31 21:28:50 +00:00
Christian Wailes
4e9218d786 Merge "Remove a misleading "flush" function." am: d6f04e744d am: 932b360d45 am: ceeadec8d9 am: 8429763697
am: eb699b5db3

Change-Id: I64182cb9abd3ae64a906b406168024e8cfb566e9
2019-08-30 17:09:59 -07:00
Christian Wailes
8429763697 Merge "Remove a misleading "flush" function." am: d6f04e744d am: 932b360d45
am: ceeadec8d9

Change-Id: I96b5809d777705bc1b1c206a71e4d7a570022a6a
2019-08-30 16:43:39 -07:00
Christian Wailes
932b360d45 Merge "Remove a misleading "flush" function."
am: d6f04e744d

Change-Id: I31a2c6a8b49493ea85816071874c3e08841f233f
2019-08-30 16:24:39 -07:00
Christian Wailes
d6f04e744d Merge "Remove a misleading "flush" function." 2019-08-30 22:59:41 +00:00
Aurimas Liutikas
9b361c2674 Merge "Add missing nullability annotations." 2019-08-30 18:30:39 +00:00
Sarah Chin
5741927f2b Merge "Handle 5G meteredness in telephony framework" 2019-08-30 17:41:18 +00:00
Aurimas Liutikas
de0ebb082e Merge "Add missing nullability annotations." into stage-aosp-master am: 85c0a5a2be
am: ed5beec21b

Change-Id: I202951d51820be47b9195734601830553215bdd7
2019-08-30 08:43:01 -07:00
Aurimas Liutikas
85c0a5a2be Merge "Add missing nullability annotations." into stage-aosp-master 2019-08-30 15:19:45 +00:00
Aurimas Liutikas
34c56bcf4a Merge "Add missing nullability annotations." 2019-08-30 15:14:37 +00:00
Sarah Chin
92860a704b 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
2019-08-30 14:27:39 +00:00
Remi NGUYEN VAN
be354592f0 Merge "Run callbacks on ConnectivityService thread" am: bef5d2165d am: 5af10311a3 am: 6f757cc4a1 am: 5020c0b69e
am: 99ad4a5368

Change-Id: I382db90c318495244a42a2d4af6e5ebf54f05750
2019-08-30 04:17:08 -07:00
Remi NGUYEN VAN
5020c0b69e Merge "Run callbacks on ConnectivityService thread" am: bef5d2165d am: 5af10311a3
am: 6f757cc4a1

Change-Id: I12d7b8fca85502807288bba03417f2ceb0c9f533
2019-08-30 03:53:46 -07:00
Remi NGUYEN VAN
5af10311a3 Merge "Run callbacks on ConnectivityService thread"
am: bef5d2165d

Change-Id: I7a8d035ec7453c5351eb2646c631c19964cb0f88
2019-08-30 03:36:26 -07:00
Aurimas Liutikas
1da3bde08d Add missing nullability annotations.
To prepare for enabling MissingNullability Metalava check this CL
works on adding missing nullability issues that metalava flags if
we tell it to flag new things since API 29.

This is not a complete CL, mostly addresses public api and
toString/equals for @SystemApi

Exempt-From-Owner-Approval: Large scale nullability clean up
Bug: 124515653
Test: make -j checkapi
Merged-In: I109260842cfc25f06e40694997fcbb4afa02c867
Change-Id: I109260842cfc25f06e40694997fcbb4afa02c867
2019-08-30 00:16:24 +00:00
Aurimas Liutikas
4d1699da48 Add missing nullability annotations.
To prepare for enabling MissingNullability Metalava check this CL
works on adding missing nullability issues that metalava flags if
we tell it to flag new things since API 29.

This is not a complete CL, mostly addresses public api and
toString/equals for @SystemApi

Exempt-From-Owner-Approval: Large scale nullability clean up
Bug: 124515653
Test: make -j checkapi
Change-Id: I109260842cfc25f06e40694997fcbb4afa02c867
2019-08-29 17:15:44 -07:00
Aurimas Liutikas
00be951a08 Add missing nullability annotations.
To prepare for enabling MissingNullability Metalava check this CL
works on adding missing nullability issues that metalava flags if
we tell it to flag new things since API 29.

This is not a complete CL, mostly addresses public api and
toString/equals for @SystemApi

Exempt-From-Owner-Approval: Large scale nullability clean up
Bug: 124515653
Test: make -j checkapi
Merged-In: I109260842cfc25f06e40694997fcbb4afa02c867
Change-Id: I109260842cfc25f06e40694997fcbb4afa02c867
2019-08-30 00:14:44 +00:00
Remi NGUYEN VAN
f9354793f9 Run callbacks on ConnectivityService thread
Run MultinetworkPolicyTracker and DataConnectionStats callbacks on the
ConnectivityService handler thread.

Previously the callbacks would be using the SystemServer foreground
thread (Looper.myLooper()), or the broadcast thread for the
MultinetworkPolicyTracker BroadcastReceiver. This is error-prone, can
cause threading issues and makes it difficult to test the components.

Test: atest FrameworksNetTests
Change-Id: I189213dd363004abed294659165bf5430d153bba
2019-08-28 10:10:04 +09:00
Chris Wailes
9d8b926859 Remove a misleading "flush" function.
This patch removes LocalSocketImpl.flush().  In practice this function
was simply a wrapper around `Thread.sleep(10)`.  All direct calls to
this function have been removed.  The `flush()` function is still called
on several objects that wrap a SocketOutputStream.

This will make booting a device 20ms faster than it currently is.

Bug: 139192244
Test: Build -> flash -> boot -> launch app
Change-Id: I0a96f4bc72461670370f61e847349f32af5ac774
2019-08-27 14:51:21 -07:00
Oscar Shu
70ee8b5c86 Merge "avoid generating reserved local MACs" am: e5d5b73109 am: 65a98b4002 am: 4f05f46f13 am: 02142d5462
am: edeb0313b7

Change-Id: If0fdc7bd46f711714986440a9a905f2ccb154830
2019-08-24 01:33:53 -07:00
Oscar Shu
02142d5462 Merge "avoid generating reserved local MACs" am: e5d5b73109 am: 65a98b4002
am: 4f05f46f13

Change-Id: Icce1e14fae4293d747d0f9a57c99bb52fee31ba0
2019-08-23 03:14:04 -07:00
Oscar Shu
65a98b4002 Merge "avoid generating reserved local MACs"
am: e5d5b73109

Change-Id: Ia6d0eb0c5e8101d9c4b4bc63de79157f7d1c2284
2019-08-23 02:24:15 -07:00
Oscar Shu
e5d5b73109 Merge "avoid generating reserved local MACs" 2019-08-21 17:45:00 +00:00
xshu
683b756b25 avoid generating reserved local MACs
Avoid generating WifiInfo.DEFAULT_MAC_ADDRESS as a randomized MAC
address since it's being used for another purpose.

Bug: 137796328
Test: atest MacAddressTest
Change-Id: Ia7beef0d0af5d7b39845e662cd343d81aef97702
2019-08-16 10:20:22 -07:00
Chiachang Wang
5be260e609 Merge "Get resource based on subId for multi-SIM" am: 55752cf8d4 am: 2afb11fbc8 am: 2b7f2fbb5b am: 5e994ea02c
am: 953f3a62ce

Change-Id: Ief32e4d6376062ba6e86472e39d84681f562980a
2019-08-14 05:21:30 -07:00
Chiachang Wang
5e994ea02c Merge "Get resource based on subId for multi-SIM" am: 55752cf8d4 am: 2afb11fbc8
am: 2b7f2fbb5b

Change-Id: I1e69a49c88f6123f735075934f2f2e08f15f2bff
2019-08-14 04:54:59 -07:00
Chiachang Wang
2afb11fbc8 Merge "Get resource based on subId for multi-SIM"
am: 55752cf8d4

Change-Id: I020c2546fa4432d05cf27b20fdb1943508aac671
2019-08-14 04:30:57 -07:00