Commit Graph

46159 Commits

Author SHA1 Message Date
Junyu Lai
83e3f4608b Merge "[MS42.2] Adopt TelephonyDisplayInfo in unit test" am: 6a360b5a71 am: 665da11c53 am: b7396ea9bf
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1938693

Change-Id: Ia39970b80eb359ab3c157b3b5a782736c3afcc1d
2022-01-10 12:34:20 +00:00
Junyu Lai
b7396ea9bf Merge "[MS42.2] Adopt TelephonyDisplayInfo in unit test" am: 6a360b5a71 am: 665da11c53
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1938693

Change-Id: I8540010df5ba0e714d17d6b8b19359489de5a31e
2022-01-10 12:21:09 +00:00
Junyu Lai
665da11c53 Merge "[MS42.2] Adopt TelephonyDisplayInfo in unit test" am: 6a360b5a71
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1938693

Change-Id: I72c3175fe3dce0800051d854928a1227d6f5c225
2022-01-10 12:06:47 +00:00
Junyu Lai
6a360b5a71 Merge "[MS42.2] Adopt TelephonyDisplayInfo in unit test" 2022-01-10 11:43:58 +00:00
Bill Yi
a6990dafd5 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 725bc31d29 -s ours am: da274ec5f2 -s ours am: 95ab039647 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I7dfa611ea501cf0adde52d648bca9fe13c1361d7
2022-01-09 05:58:48 +00:00
Bill Yi
2614ae9d04 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: be8fc3803d -s ours am: 70ef817581 -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ie99158e142a86eae632ddaf1542214d878134880
2022-01-09 05:58:04 +00:00
Bill Yi
3922c295ed [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 725bc31d29 -s ours am: da274ec5f2 -s ours am: d278454744 -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ifa096d5288ab039db3e11d742cdd4973daa6cba6
2022-01-09 05:52:02 +00:00
Bill Yi
1acbbcf107 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: be8fc3803d -s ours am: 8ee687d87b -s ours
am skip reason: subject contains skip directive

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

Change-Id: I33f908c5c5a079a28846afbc71c2c5d2f1e2f286
2022-01-09 05:46:54 +00:00
Bill Yi
95ab039647 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 725bc31d29 -s ours am: da274ec5f2 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I38e37397afe5f9f19c7d91bc5c13e13c865f7e92
2022-01-09 05:46:05 +00:00
Bill Yi
70ef817581 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: be8fc3803d -s ours
am skip reason: subject contains skip directive

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

Change-Id: I1027739eb07645c8edda8cdfcb938a869a67f0a4
2022-01-09 05:44:44 +00:00
Bill Yi
d278454744 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 725bc31d29 -s ours am: da274ec5f2 -s ours
am skip reason: subject contains skip directive

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

Change-Id: Id0407b8957d0fc20c8bf1726234a4cc1dc0bbcad
2022-01-09 05:44:43 +00:00
Bill Yi
8ee687d87b [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: be8fc3803d -s ours
am skip reason: subject contains skip directive

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

Change-Id: I6d5d03b6dda1f23fd13b17540fba6e983c291566
2022-01-09 05:43:56 +00:00
Bill Yi
da274ec5f2 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 725bc31d29 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I645bffdbf496e0cbefd815b17be8b6d5ec4756c5
2022-01-09 05:43:54 +00:00
Bill Yi
c2359aa2ce [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 742792ff40 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I67e5a31be12ebad3e67d591acfad2207327edbc0
2022-01-09 05:43:47 +00:00
Bill Yi
742792ff40 Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: Iea8616779d0e27d13eb0b87857b5106b15e38c1f
2022-01-08 05:15:41 +00:00
Bill Yi
be8fc3803d Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: Ia09c81abfe90e4e54d11228e4b56d4a671902985
2022-01-08 05:14:29 +00:00
Bill Yi
725bc31d29 Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: I85fdf0d1af82a8e41bcbb85f9e7addcb97ab7be6
2022-01-08 05:13:16 +00:00
Matt Buckley
c0b36f3211 Merge "Revert^2 "Revert "Add CTS tests for exclude VPN routes APIs""" am: 67197b7ed6 am: e6aed4b035 am: fb982983ce
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1941195

Change-Id: Ieaad9570901fad66353f3ae6fdcbe7038e4f7950
2022-01-07 18:35:24 +00:00
Matt Buckley
fb982983ce Merge "Revert^2 "Revert "Add CTS tests for exclude VPN routes APIs""" am: 67197b7ed6 am: e6aed4b035
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1941195

Change-Id: Ib6f4c89516ac4c936a89b640b57d381ce255b2ba
2022-01-07 18:17:35 +00:00
Matt Buckley
e6aed4b035 Merge "Revert^2 "Revert "Add CTS tests for exclude VPN routes APIs""" am: 67197b7ed6
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1941195

Change-Id: I79923b432c049fb8e2cbd42d97f49e78d0631b24
2022-01-07 17:50:51 +00:00
Matt Buckley
67197b7ed6 Merge "Revert^2 "Revert "Add CTS tests for exclude VPN routes APIs""" 2022-01-07 17:48:45 +00:00
Matt Buckley
01d9abecef Revert^2 "Revert "Add CTS tests for exclude VPN routes APIs""
1a6d19e4b8

Change-Id: Ic25e5e4eaf57e033a9304244387e6fba15213d2b
2022-01-07 17:44:52 +00:00
Taras Antoshchuk
3f9ece0e67 Merge "Revert "Revert "Add CTS tests for exclude VPN routes APIs""" am: b0818dd720 am: b4177c19ea am: 60e77a6b52
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1931760

Change-Id: I71c135104a7dad9cf4d593cb334d212762d43f68
2022-01-07 17:20:30 +00:00
Taras Antoshchuk
60e77a6b52 Merge "Revert "Revert "Add CTS tests for exclude VPN routes APIs""" am: b0818dd720 am: b4177c19ea
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1931760

Change-Id: I3467cb48023c7da6de571920bb52e2bc9cf289ad
2022-01-07 17:05:55 +00:00
Taras Antoshchuk
b4177c19ea Merge "Revert "Revert "Add CTS tests for exclude VPN routes APIs""" am: b0818dd720
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1931760

Change-Id: I8ad75ca171f00eff1d8a0f9ed3b06b78d3347265
2022-01-07 16:44:00 +00:00
Taras Antoshchuk
b0818dd720 Merge "Revert "Revert "Add CTS tests for exclude VPN routes APIs""" 2022-01-07 16:27:12 +00:00
Treehugger Robot
e25f2b35c7 Merge "[MS39.2] Remove the looper from NetworkStatsSubscriptionMonitor" am: 7d9470ca0b am: fc294135ba am: c6cb899865
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1936490

Change-Id: I167314dacdf0102aae00d67d229fc4459d1bc56a
2022-01-07 16:18:52 +00:00
Junyu Lai
07da334957 Merge changes from topic "ms17-multipath" am: bc1f44adb0 am: 31028206da am: c412b621ce
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1930833

Change-Id: I361364428b7d5065d7242ad9ad52555b8f479bb4
2022-01-07 16:18:34 +00:00
Junyu Lai
3dae2f74bb [MS17.2] Fix remaining daily budget assertion am: eaa58de991 am: e09d39d37e am: 7cec348cd4
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1930832

Change-Id: Ia31faefa7f8655849419e2b9ad26412469210d45
2022-01-07 16:18:30 +00:00
Treehugger Robot
c6cb899865 Merge "[MS39.2] Remove the looper from NetworkStatsSubscriptionMonitor" am: 7d9470ca0b am: fc294135ba
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1936490

Change-Id: I4349dd3fe4ef291df4c0a77a23a8a8dc30f9e06a
2022-01-07 15:57:30 +00:00
Junyu Lai
c412b621ce Merge changes from topic "ms17-multipath" am: bc1f44adb0 am: 31028206da
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1930833

Change-Id: I9263c1ede3fd0558c269ce0aeb5acd941f971860
2022-01-07 15:57:06 +00:00
Junyu Lai
7cec348cd4 [MS17.2] Fix remaining daily budget assertion am: eaa58de991 am: e09d39d37e
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1930832

Change-Id: Id8834e89326119fac5bbf10b94d6e62b8e5eb1f8
2022-01-07 15:57:04 +00:00
Treehugger Robot
fc294135ba Merge "[MS39.2] Remove the looper from NetworkStatsSubscriptionMonitor" am: 7d9470ca0b
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1936490

Change-Id: I1458ab6ba83d4ab5fcc36c6fa7fb5ddfde8e04a7
2022-01-07 15:02:37 +00:00
Treehugger Robot
7d9470ca0b Merge "[MS39.2] Remove the looper from NetworkStatsSubscriptionMonitor" 2022-01-07 14:42:52 +00:00
Junyu Lai
31028206da Merge changes from topic "ms17-multipath" am: bc1f44adb0
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1930833

Change-Id: I89f407506bf633fe17d23832192b9f94d8accb68
2022-01-07 14:32:20 +00:00
Junyu Lai
e09d39d37e [MS17.2] Fix remaining daily budget assertion am: eaa58de991
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1930832

Change-Id: Ia9d27be5a7114f547946375efeebd6ea848af351
2022-01-07 14:32:19 +00:00
Junyu Lai
bc1f44adb0 Merge changes from topic "ms17-multipath"
* changes:
  [MS17.3] Remove NetworkStatsManagerInternal dependency
  [MS17.2] Fix remaining daily budget assertion
2022-01-07 14:17:03 +00:00
Siim Sammul
2cacd18d82 Include "generate_transaction_name" in the aidl build rules for am: cd4c8228bd am: 41e2be2aa8 am: 0424edbecf
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1918669

Change-Id: Ie1e8da01d590d6710bbebe7e0a864f130dad7791
2022-01-07 12:27:46 +00:00
Siim Sammul
0424edbecf Include "generate_transaction_name" in the aidl build rules for am: cd4c8228bd am: 41e2be2aa8
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1918669

Change-Id: I8ae1bf9e30ebce2a9f2ef7d9c288745453416b49
2022-01-07 12:08:34 +00:00
Siim Sammul
41e2be2aa8 Include "generate_transaction_name" in the aidl build rules for am: cd4c8228bd
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1918669

Change-Id: I40bb8fa0ba1de9804b692318bae113e20e87493e
2022-01-07 11:54:52 +00:00
Junyu Lai
50a8f07132 [MS42.2] Adopt TelephonyDisplayInfo in unit test
Test: atest NetworkStatsSubscriptionsMonitorTest
Fix: 213021103

Change-Id: Ib6b472a095a6ae92a2574c1ea2d382e1c2699d57
2022-01-07 06:45:56 +00:00
Junyu Lai
0e9c51ca5c [MS39.2] Remove the looper from NetworkStatsSubscriptionMonitor
OnSubscriptionsChangedListenerHandler(Looper looper) is
hidden, there is no way to pass a looper to it in the test.
This change partially revert aosp/1340040 to fix hidden
API dependency. And will use a different approach to address
this problem in later stages.

Test: atest NetworkStatsSubscriptionMonitorTest
Bug: 204830222
Bug: 213280079
Change-Id: Ie17f04cd9f174f2895bde4607bbd7a9a92181a96
2022-01-07 06:45:56 +00:00
Junyu Lai
eaa58de991 [MS17.2] Fix remaining daily budget assertion
Currently, the test didn't mock data usage of the month.
Thus, when asserting remaining budget, the calculation
always assumes there is no used data, hence wrong budget
value is expected. See #getRemainingDailyBudget.

This change makes data usage of this month includes the
bytes used today. And adjust the policy limit accordingly.

Test: atest MultipathPolicyTrackerTest
Bug: 204830222
Change-Id: I3ca6505f8d502047485ba3676f16fbc474117cc1
2022-01-07 06:45:56 +00:00
Junyu Lai
3cb8fe8c66 [MS17.3] Remove NetworkStatsManagerInternal dependency
Test: atest MultipathPolicyTrackerTest
Bug: 204830222

Change-Id: I219e963124b8fa0967ea08f2f047f7c654ab4a04
2022-01-07 06:45:56 +00:00
Siim Sammul
cd4c8228bd Include "generate_transaction_name" in the aidl build rules for
Connectivity as otherwise method names are not visible in the collected
binder latency data.

Test: N/A
Bug: 208515821
Change-Id: I0e6c6dcd4663f0abe473d39f7de4c718ac3fb66f
2022-01-06 15:21:13 +00:00
Junyu Lai
51b14b066f Merge "[MS32.2] Remove TetheringManager#ACTION_TETHER_STATE_CHANGED usage" am: 392161e651 am: 89d6bdf330 am: 5bdd14b848
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1935967

Change-Id: Ib3d96cd7d86f44fd0431ca8803c4891b16e91a55
2022-01-06 14:24:10 +00:00
Junyu Lai
c29114ba64 Merge "[MS34.2] Replace TelephonyManager#getSubscriberId(subId) with public API" am: 38e0582797 am: 13f0d24647 am: 1b69ac1a18
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1935970

Change-Id: I48c9ab49883577cee3d17c7310d7d31a4b3109c7
2022-01-06 14:23:37 +00:00
Junyu Lai
5bdd14b848 Merge "[MS32.2] Remove TetheringManager#ACTION_TETHER_STATE_CHANGED usage" am: 392161e651 am: 89d6bdf330
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1935967

Change-Id: I3ab051c2745baab3081cbeb91daf5d10aaee168c
2022-01-06 14:09:50 +00:00
Junyu Lai
1b69ac1a18 Merge "[MS34.2] Replace TelephonyManager#getSubscriberId(subId) with public API" am: 38e0582797 am: 13f0d24647
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1935970

Change-Id: Ibc05a4867e8ed2722352245e383313dba02448ff
2022-01-06 14:09:31 +00:00
Junyu Lai
89d6bdf330 Merge "[MS32.2] Remove TetheringManager#ACTION_TETHER_STATE_CHANGED usage" am: 392161e651
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1935967

Change-Id: I50d2557ea2280947bdfaba097c68eefdcae767a9
2022-01-06 14:04:04 +00:00