Commit Graph

30230 Commits

Author SHA1 Message Date
Aaron Huang
b3d01d2c1d Merge "Remove framework-connectivity-annotations library" into sc-dev am: 059ddb4025 am: 4a3eb4e02c
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/14731888

Change-Id: I078cfb1f3bf500f90bc73b1f440e9fe9bc7e05d8
2021-06-01 08:49:37 +00:00
TreeHugger Robot
f96011db0f Merge changes I81bf8969,I2edba513,Ibb913979 into sc-dev am: 98c351f429 am: 585c1b72d8
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/14452540

Change-Id: If343a053e102a1b87bafa500560a02df2ee15615
2021-06-01 08:24:56 +00:00
Aaron Huang
4a3eb4e02c Merge "Remove framework-connectivity-annotations library" into sc-dev am: 059ddb4025
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/14731888

Change-Id: I350a2b3cf64110d941472fc8eb25beefdb6743f0
2021-06-01 08:20:24 +00:00
Aaron Huang
059ddb4025 Merge "Remove framework-connectivity-annotations library" into sc-dev 2021-06-01 08:08:21 +00:00
TreeHugger Robot
585c1b72d8 Merge changes I81bf8969,I2edba513,Ibb913979 into sc-dev am: 98c351f429
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/14452540

Change-Id: I92bceef971050f9afc1fea0e1f3a3e6f4391db5f
2021-06-01 08:06:28 +00:00
TreeHugger Robot
98c351f429 Merge changes I81bf8969,I2edba513,Ibb913979 into sc-dev
* changes:
  Add CTS for NetworkScore.setTransportPrimary
  Add some CTS tests for NetworkScore.
  Add a first CTS for NetworkScore
2021-06-01 07:41:17 +00:00
Aaron Huang
cff22949d2 Remove framework-connectivity-annotations library
This library can be removed because the annotations are no longer
used out of module.

@RestrictBackgroundStatus and @MultipathPreference are defined
in connectivity mainline module. Annotate these in non-updatable
platform is not going to be manageable long term. For example,
if the module gets updated and the annotation gets more values
then it's a problem in non-updatable platform. So, it should
not have IntDef cross module boundaries.

Ignore-AOSP-First: AOSP doesn't include this change yet
Bug: 183972925
Test: build
Change-Id: I63f1fde73c4ffdaff9fda914e33cbb5a110ba64e
2021-06-01 06:47:47 +00:00
Chiachang Wang
65a7ab94fc [automerger skipped] Merge "Unify the verification for unregister a NetworkAgent" into sc-dev am: 1084882539 -s ours am: fdef75e1c4 -s ours
am skip reason: Merged-In I66d8e5a0fa1e2245711e8ac90d9daca24802e399 with SHA-1 f9093389f5 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/14706912

Change-Id: I2ce1b8ad3f029302282ecb025ee27cf9f09820ca
2021-06-01 03:00:03 +00:00
Chiachang Wang
fdef75e1c4 [automerger skipped] Merge "Unify the verification for unregister a NetworkAgent" into sc-dev am: 1084882539 -s ours
am skip reason: Merged-In I66d8e5a0fa1e2245711e8ac90d9daca24802e399 with SHA-1 f9093389f5 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/14706912

Change-Id: Idf3c1effc91ef2154ea7361bb9f4c49416d6c70a
2021-06-01 02:33:56 +00:00
Chalard Jean
ee93b3d3b3 Add CTS for NetworkScore.setTransportPrimary
Ignore-AOSP-First: NetworkScore incomplete in AOSP
Bug: 184037351
Test: this
Change-Id: I81bf8969ace3cb6826b30c5bbd0b896c64c73c57
2021-06-01 02:20:57 +00:00
Chalard Jean
2d2ecc3cfb Add some CTS tests for NetworkScore.
Ignore-AOSP-First: NetworkScore incomplete in AOSP
Bug: 184037351
Test: this
Change-Id: I2edba51351cd4c71727663aa85b1d5141bff2a15
2021-06-01 02:20:54 +00:00
Chalard Jean
aac204b202 Add a first CTS for NetworkScore
In an effort to make reviewing easier, this implements most of
the infra but only a mostly trivial test.

Ignore-AOSP-First: NetworkScore incomplete in AOSP
Bug: 184037351
Test: this
Change-Id: Ibb9139798ce44d748e87bae79a1e23311ec8d9b6
2021-06-01 02:20:26 +00:00
Chiachang Wang
1084882539 Merge "Unify the verification for unregister a NetworkAgent" into sc-dev 2021-06-01 02:09:37 +00:00
Jeff Sharkey
1fc90acaab resolved conflicts for merge of ab4e251a to master am: 696aeb4e78 am: 722c93c55a am: 24797528dd
Original change: undetermined

Change-Id: I4153c19c58bdc6ada001b10b877043cdbaf04e7d
2021-05-31 13:12:45 +00:00
Ashish Sharma
110c770216 Merge "Setup idletimer for network interface." am: 5f4cd1dfef am: fdb4349bff am: aee106f104
Original change: undetermined

Change-Id: I7d7f8d1b56be2888ea1914346667f97b2c5b3b46
2021-05-31 13:12:31 +00:00
Jeff Sharkey
d2c13811ff Merge "Include network type that caused broadcast." into jb-mr1-dev am: 976942a8ee am: 1609ab35a4 am: d55a2c6d32
Original change: undetermined

Change-Id: I2435431d647b416d3b84fddc00396ff61f65f281
2021-05-31 13:12:17 +00:00
Jeff Sharkey
1a4446f674 Make generic BaseNetworkObserver. am: 60e6c1ac06 am: 5584362dd3 am: 49b5ef8246
Original change: undetermined

Change-Id: Iaa61b335dc5faa33b92c84ff38e67eeb40957fc3
2021-05-31 13:12:02 +00:00
Jeff Sharkey
24797528dd resolved conflicts for merge of ab4e251a to master am: 696aeb4e78 am: 722c93c55a
Original change: undetermined

Change-Id: I77ed2b8aae693d1d36a549b703932562e6d9b8ac
2021-05-31 13:11:41 +00:00
Ashish Sharma
aee106f104 Merge "Setup idletimer for network interface." am: 5f4cd1dfef am: fdb4349bff
Original change: undetermined

Change-Id: Ia83e549a63587b6f8369f72b64e429c86c357a47
2021-05-31 13:11:27 +00:00
Jeff Sharkey
d55a2c6d32 Merge "Include network type that caused broadcast." into jb-mr1-dev am: 976942a8ee am: 1609ab35a4
Original change: undetermined

Change-Id: I7c2d33226fc6b13abe213b554ed9cef8f52360e6
2021-05-31 13:11:12 +00:00
Jeff Sharkey
5e3e4fd210 Split NST handler events away from CS internals. am: a1ef1bec2a am: 5194390267 am: b8c2161750
Original change: undetermined

Change-Id: Ib2401412f9be2b901f576ca48d33921cc0d354bb
2021-05-31 13:00:36 +00:00
Haoyu Bai
3909f57a57 Network data activity change intent for network interfaces. am: b5da575fc7 am: 4b220373c7 am: 61d03b9e47
Original change: undetermined

Change-Id: Ib4c120a5a86023e32ff270a16005174d01718f45
2021-05-31 13:00:23 +00:00
Wink Saville
91b2617673 [automerger skipped] am 406feb59: (-s ours) Create telephony-common and mms-common - DO NOT MERGE am: e0bdc06669 am: 075e9ea120 am: 1aad38ce84 -s ours
am skip reason: subject contains skip directive

Original change: undetermined

Change-Id: I002d11c81be466ed8e9c2fca3c375a0fbe0c0689
2021-05-31 13:00:10 +00:00
Wink Saville
bb881939ae Create telephony-common and mms-common am: 64e3f78abb am: a6cf2ac4e2 am: aac67de5f5
Original change: undetermined

Change-Id: I228c66a68b5bad15db211900e48508038255d24f
2021-05-31 13:00:01 +00:00
Jeff Sharkey
49b5ef8246 Make generic BaseNetworkObserver. am: 60e6c1ac06 am: 5584362dd3
Original change: undetermined

Change-Id: I1a86a8f2ecfedd9664b8712f58b073923af51f76
2021-05-31 12:59:55 +00:00
The Android Open Source Project
02e78ed87b Reconcile with jb-release am: da0ba6beec am: af2d1c660c am: 2b000d20aa
Original change: undetermined

Change-Id: I1ab182a2715918eceeb1632c0a3bed177e0ca1db
2021-05-31 12:59:47 +00:00
Jeff Sharkey
b8c2161750 Split NST handler events away from CS internals. am: a1ef1bec2a am: 5194390267
Original change: undetermined

Change-Id: I3b83f64addf51998763eac70b5fd92cebdcbceca
2021-05-31 12:59:42 +00:00
Nicolas Falliere
c046fc1b9e am 56bb344c: Merge "Added or fixed doctrings for required permissions." into jb-dev am: 5889983f0b am: a15bb3235c am: c50bffe61f
Original change: undetermined

Change-Id: I614adf7168a6981fe2c9a62da33bc14909f428f3
2021-05-31 12:59:34 +00:00
Haoyu Bai
61d03b9e47 Network data activity change intent for network interfaces. am: b5da575fc7 am: 4b220373c7
Original change: undetermined

Change-Id: Ide6264f4d412e97bbfb166aaad9adddfa12c7d24
2021-05-31 12:59:29 +00:00
The Android Open Source Project
f73274efa2 Reconcile with jb-release nakasi-factoryrom-release am: 29cdec9fd3 am: a8365c8ffc am: 90ff67f389
Original change: undetermined

Change-Id: I02c8f03a304376db731039d24af85270068c4722
2021-05-31 12:59:20 +00:00
Wink Saville
1aad38ce84 am 406feb59: (-s ours) Create telephony-common and mms-common - DO NOT MERGE am: e0bdc06669 am: 075e9ea120
Original change: undetermined

Change-Id: Iad9154cd0559dc0e2b5138c2ef8d098dfd3c31ce
2021-05-31 12:59:16 +00:00
Robert Greenwalt
0d46d5b78a am 1ed1de7a: Merge "Modify logging to debug this issue" into jb-dev am: 6568a45c99 am: 33d98f442c am: 9f20f0e98f
Original change: undetermined

Change-Id: I3c2c6d460ef185807bf0e42bf67a534cfd7eec17
2021-05-31 12:59:04 +00:00
Wink Saville
aac67de5f5 Create telephony-common and mms-common am: 64e3f78abb am: a6cf2ac4e2
Original change: undetermined

Change-Id: I9d6d1ec59cab36eafdac47b94967e3623eaa70ec
2021-05-31 12:59:03 +00:00
The Android Open Source Project
2b000d20aa Reconcile with jb-release am: da0ba6beec am: af2d1c660c
Original change: undetermined

Change-Id: I3a78fb187c3b7877855232b24a22f4350802cb68
2021-05-31 12:58:51 +00:00
The Android Open Source Project
e479b0f29b Reconcile with jb-release am: ce77d5e629 am: 568058b91f am: 3eacc66405
Original change: undetermined

Change-Id: I4261d2b03f1a454fc1676c03d5623cd4eb401440
2021-05-31 12:58:51 +00:00
Nicolas Falliere
c50bffe61f am 56bb344c: Merge "Added or fixed doctrings for required permissions." into jb-dev am: 5889983f0b am: a15bb3235c
Original change: undetermined

Change-Id: I6e8ebd4e90bd176759202f75901a419a68097c79
2021-05-31 12:58:37 +00:00
Jeff Sharkey
c43fcd5e91 am 787c9ec5: Merge "Transition from DEV network stats to XT." into jb-dev am: dae5f0a509 am: b3d60c3b4e am: 9bd4cafb43
Original change: undetermined

Change-Id: I6d0b4bf2dd8915f3563ec05e3599ce3fba768d3d
2021-05-31 12:58:37 +00:00
The Android Open Source Project
90ff67f389 Reconcile with jb-release nakasi-factoryrom-release am: 29cdec9fd3 am: a8365c8ffc
Original change: undetermined

Change-Id: Ie2193b526dba5fdb66e8e5727fede99f61d908a3
2021-05-31 12:58:24 +00:00
The Android Automerger
1b812d6dab merge in jb-release history after reset to jb-dev am: 2da3efe1e8 am: 76dacb1f0d am: 60b6e458d9
Original change: undetermined

Change-Id: I4a16e4f22eb285dc29da2cb09e91d5a06e5d64a2
2021-05-31 12:58:23 +00:00
Robert Greenwalt
9f20f0e98f am 1ed1de7a: Merge "Modify logging to debug this issue" into jb-dev am: 6568a45c99 am: 33d98f442c
Original change: undetermined

Change-Id: Ia1c4ca771969fe4111bf4fdc1af283f417428286
2021-05-31 12:58:09 +00:00
Jeff Sharkey
c7e71f31c0 Fix network stats and policy tests. am: 0e5fa591b9 am: 8a6a567e51 am: 01ae0e500e
Original change: undetermined

Change-Id: Ic68909ca634b42acc375c0f40bd8ee8b00d019f7
2021-05-31 12:58:09 +00:00
The Android Open Source Project
3eacc66405 Reconcile with jb-release am: ce77d5e629 am: 568058b91f
Original change: undetermined

Change-Id: I78fa481951dc1ff25f1e15574fe70e681dec9504
2021-05-31 12:57:56 +00:00
Jeff Sharkey
833631f5f6 Merge "Reduce persist threshold for lower warning/limit." into jb-dev am: 04536e49a0 am: fb0656090d am: 80fdcb9858
Original change: undetermined

Change-Id: If1d803d177ec51beb9c02c666912b90e73c79c58
2021-05-31 12:57:55 +00:00
Jeff Sharkey
9bd4cafb43 am 787c9ec5: Merge "Transition from DEV network stats to XT." into jb-dev am: dae5f0a509 am: b3d60c3b4e
Original change: undetermined

Change-Id: Id7450ec0d2be29923e0b0aa810e272c741ac756f
2021-05-31 12:57:42 +00:00
Jeff Sharkey
3e2c2ce2ce Merge "Begin collecting xtables iface counters." into jb-dev am: 1e329235a6 am: e0564bc0e8 am: a2c64f182e
Original change: undetermined

Change-Id: I554ff433ad46e473e5fe1174dc6a33b603f79641
2021-05-31 12:57:40 +00:00
The Android Automerger
60b6e458d9 merge in jb-release history after reset to jb-dev am: 2da3efe1e8 am: 76dacb1f0d
Original change: undetermined

Change-Id: I2e7d6655bbc2433be151afceb29ab9a7005612f7
2021-05-31 12:57:29 +00:00
Jeff Sharkey
0a1799463f Merge "Block metered APNs when app is restricted." into jb-dev am: 528c3f2139 am: 3c8120d790 am: 4d60da313c
Original change: undetermined

Change-Id: I311d0374611387a74a6c2237bdf029d3b3d33954
2021-05-31 12:57:27 +00:00
Jeff Sharkey
01ae0e500e Fix network stats and policy tests. am: 0e5fa591b9 am: 8a6a567e51
Original change: undetermined

Change-Id: I670145fe0fad84d4e2a2566aa8abe118e3572aa7
2021-05-31 12:57:15 +00:00
Jeff Sharkey
bccb98364c Support full 32 bits for socket tags. am: 528cf48b34 am: fb9efec892 am: ce3ec183f0
Original change: undetermined

Change-Id: Ib3e5a44628a8b09db617038f2af6091dab8d46e0
2021-05-31 12:57:12 +00:00
Jeff Sharkey
80fdcb9858 Merge "Reduce persist threshold for lower warning/limit." into jb-dev am: 04536e49a0 am: fb0656090d
Original change: undetermined

Change-Id: I754a16fd5b972c37f7bb080e056841275c496b4f
2021-05-31 12:57:01 +00:00