Commit Graph

46173 Commits

Author SHA1 Message Date
Chiachang Wang
edb96ff9ca Merge "Add test for setting excludeLocalRoutes" am: da13f899e3 am: a460e2e474 am: ab58f0c4c2
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1937330

Change-Id: I93de5869703b1bdb2e9537045de568cf87a07cc3
2022-01-11 09:51:39 +00:00
Chiachang Wang
ab58f0c4c2 Merge "Add test for setting excludeLocalRoutes" am: da13f899e3 am: a460e2e474
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1937330

Change-Id: I3072bab23bae32c1182096cb566529a6a3594778
2022-01-11 09:33:29 +00:00
Chiachang Wang
a460e2e474 Merge "Add test for setting excludeLocalRoutes" am: da13f899e3
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1937330

Change-Id: I5cc037b6377bb71c8a5a3a126821818ef57737ec
2022-01-11 09:13:45 +00:00
Chiachang Wang
da13f899e3 Merge "Add test for setting excludeLocalRoutes" 2022-01-11 08:56:38 +00:00
Treehugger Robot
00ab978952 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: 296bbae13c -s ours am: d132fa0cd0 -s ours am: ca5aa787e1 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I3b2571e020d51af628387d7c71baee7e05175fdc
2022-01-11 01:57:01 +00:00
Treehugger Robot
ca5aa787e1 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: 296bbae13c -s ours am: d132fa0cd0 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I22af24f6e769690ded0f17e9d37d8b6a46d13904
2022-01-11 01:35:40 +00:00
TreeHugger Robot
dedc8ea091 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into stage-aosp-master am: 00ae342f42 -s ours am: 8bbb210f6d -s ours
am skip reason: subject contains skip directive

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

Change-Id: I19331e763729829cce3d380d950a5d0beec8cb46
2022-01-11 01:18:42 +00:00
Treehugger Robot
d132fa0cd0 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: 296bbae13c -s ours
am skip reason: subject contains skip directive

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

Change-Id: Iba18fd722966d4e74bd8c0b764abb1e8013184b2
2022-01-11 01:12:05 +00:00
TreeHugger Robot
8bbb210f6d [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into stage-aosp-master am: 00ae342f42 -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ic6e30a5763a0d5b1b37d511d54f64fa9e1679a45
2022-01-11 01:03:07 +00:00
Treehugger Robot
296bbae13c Merge "Import translations. DO NOT MERGE ANYWHERE" 2022-01-11 00:49:44 +00:00
TreeHugger Robot
00ae342f42 Merge "Import translations. DO NOT MERGE ANYWHERE" into stage-aosp-master 2022-01-11 00:43:18 +00:00
Bill Yi
c1a1376836 Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: If066bbd12a50e3af9310195ffbaff306e3e29f11
2022-01-10 14:59:11 +00:00
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
a3c4f8ac63 Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: I96478827878b5c8b27c228c7a81ebecd8c62228f
2022-01-10 06:48:25 +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