Commit Graph

29132 Commits

Author SHA1 Message Date
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
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
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
49b5ef8246 Make generic BaseNetworkObserver. am: 60e6c1ac06 am: 5584362dd3
Original change: undetermined

Change-Id: I1a86a8f2ecfedd9664b8712f58b073923af51f76
2021-05-31 12:59:55 +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
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
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
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
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
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
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
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
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
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
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
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
Jeff Sharkey
a2c64f182e Merge "Begin collecting xtables iface counters." into jb-dev am: 1e329235a6 am: e0564bc0e8
Original change: undetermined

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

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

Change-Id: I02d9938095cac1fbeea79d6cca4a3afecc6c7dfb
2021-05-31 12:56:20 +00:00
Robert Greenwalt
063548150e Add bit to eventlog to handle new network types am: 310fa08670 am: 5150ae37a4
Original change: undetermined

Change-Id: I24ae5e8673cb3d797c3a95558c3ff50cc8124954
2021-05-31 12:56:06 +00:00
Robert Greenwalt
a1fa7a714c Merge "Stop complaining about failure to remove routes" am: aabfae0bc8 am: 7351acb2e7
Original change: undetermined

Change-Id: I4da6f49d89b8f23d08827462983e9b3c27b0fd4d
2021-05-31 12:55:52 +00:00
Jeff Sharkey
645d928025 Pipe DHCP vendor info towards framework. am: d6075598cb am: 6bd6f2d6ae
Original change: undetermined

Change-Id: Ic414d989e1301eabe2d71bffe018acbe1a82134f
2021-05-31 12:55:38 +00:00
Jeff Sharkey
1e32aeb94b Add ALLOW_METERED column to DownloadManager. am: 3022ee14a2 am: d65274b267
Original change: undetermined

Change-Id: I374ae428165d6523ecb808a25c161f7030c2837c
2021-05-31 12:55:24 +00:00
Jeff Sharkey
2187fe19f6 API to report if active network is metered. am: d00b130332 am: 457fef110a
Original change: undetermined

Change-Id: I3c9245b59bee31824317e2109f78c1d3defe0ea6
2021-05-31 12:55:10 +00:00
Jeff Sharkey
038a150087 Migrate to @Override to remove warnings. am: 078d356a9b am: 5ddf8cdd3a
Original change: undetermined

Change-Id: Ib5575833287545f4019ceb7e8e8aef2d91321c4f
2021-05-31 12:54:56 +00:00
Jeff Sharkey
eff6bd54a5 INetworkStatsSession with lifecycle for caching. am: dc164ff128 am: 7e808aad07
Original change: undetermined

Change-Id: I0fb25aa9d40d322fc3fc5c3f8add669f80040ab2
2021-05-31 12:54:42 +00:00
Jeff Sharkey
b9d09316da Support metered Wi-Fi NetworkPolicy. am: 2d9e5a5f9e am: 20c4bdb156
Original change: undetermined

Change-Id: Ia7030a8852ca739e19c204092e9ded82796abd9f
2021-05-31 12:54:28 +00:00
Mike Lockwood
8d4c9a210e Merge remote-tracking branch 'goog/ics-aah-exp' into merge am: 62b7c11709 am: 78a0db64e7
Original change: undetermined

Change-Id: I1ffa1d6f6d312711f57e76055b75218f729fc62e
2021-05-31 12:54:15 +00:00
yoonsung.nam
dd960facae Fix the bug net.dns1.pid is same as net.dns2.pid am: 48d1833b15 am: dc44fcd078
Original change: undetermined

Change-Id: Iafe39855bb9737486676ae6055985dda4869fc24
2021-05-31 12:54:02 +00:00
Irfan Sheriff
72c3b02aa6 Improve Wi-Fi hand-off am: b9f329f633 am: 373a9e426c
Original change: undetermined

Change-Id: I4d985bc1ef94b8b4ccf685068fe879b2add0a471
2021-05-31 12:53:48 +00:00
The Android Open Source Project
818d795c0a am 19222ad5: am 64406699: Reconcile with ics-mr1-release am: 5b04a4566f am: 2b211603d8
Original change: undetermined

Change-Id: I776cd5d48869c77edde3b6d2c0697f8601fef1f6
2021-05-31 12:53:35 +00:00
The Android Open Source Project
e6df80acf2 am d2a0a9d4: am b548bb97: Reconcile with ics-mr1-release am: 6afd0d0166 am: 71c3a732da
Original change: undetermined

Change-Id: I45b4229b69bfab02ac4e023ce9b7d5f32e08be1b
2021-05-31 12:53:22 +00:00
Robert Greenwalt
720f6a1576 am 4f967940: am ccdf4844: am c8711ca7: Merge "Stop using shared DUN APN when tethering stops." into ics-mr1 am: 0e1bb7585e am: cd27296779
Original change: undetermined

Change-Id: I0676bb99d529679514f567fbbdac594047f53998
2021-05-31 12:53:07 +00:00
Robert Greenwalt
c8229be195 am 1b2583c4: am 6df6d66f: am c8711ca7: Merge "Stop using shared DUN APN when tethering stops." into ics-mr1 am: 5a9b24658b am: f8ef9fe485
Original change: undetermined

Change-Id: I2621ce0a778178b12c6def493186b5bc4e136f43
2021-05-31 12:52:54 +00:00
Doug Zongker
e77e470c91 store the hw addr in the extraInfo field of ethernet NetworkInfos am: b1a238dbb3 am: 7e176e3c7a
Original change: undetermined

Change-Id: Ifb3767caa434d377b80f0aa20612b579209bac30
2021-05-31 12:52:41 +00:00
Jeff Sharkey
2a5bc95651 Send broadcast when changing restrict background. am: b1b6ccd157 am: 70acf41286
Original change: undetermined

Change-Id: I1ef49245d1a7a64a3f154d581ac8e252b990cf5d
2021-05-31 12:52:27 +00:00
Jeff Sharkey
f0f426a906 Unify shorthand for byte-based units. am: b3a842ef9c am: f1213b6053
Original change: undetermined

Change-Id: I29abd434bfaaff5fa2d63e7d4ba5856f2394dfa7
2021-05-31 12:52:11 +00:00
Jeff Sharkey
b5d620de0a Deprecate ACTION_BACKGROUND_DATA_SETTING_CHANGED. am: c958c77f1a am: 3d71601fab
Original change: undetermined

Change-Id: I7426abda9f0f00e4db3672d0a38b380160bc0914
2021-05-31 12:51:58 +00:00
Wink Saville
8e91c03392 Merge "Add additional debug" am: 678258626a am: 8e8f0ab8aa
Original change: undetermined

Change-Id: Ie1e3237c1e3e49bba514c17bd5bd49df6cdbef0f
2021-05-31 12:51:45 +00:00