Commit Graph

1911 Commits

Author SHA1 Message Date
Aurimas Liutikas
a124df140e [automerger skipped] Merge "Add missing nullability annotations." am: 9b361c2674 -s ours am: b3c5131dcb -s ours am: 48d66161b9 -s ours am: f4f18c5a47 -s ours
am: 5403265dc0 -s ours
am skip reason: change_id I109260842cfc25f06e40694997fcbb4afa02c867 with SHA1 3a78d9db46 is in history

Change-Id: I917109b14ba43c16af4c5977d8653e38a4900472
2019-08-30 13:03:09 -07:00
Aurimas Liutikas
f4f18c5a47 [automerger skipped] Merge "Add missing nullability annotations." am: 9b361c2674 -s ours am: b3c5131dcb -s ours
am: 48d66161b9 -s ours
am skip reason: change_id I109260842cfc25f06e40694997fcbb4afa02c867 with SHA1 3a78d9db46 is in history

Change-Id: If5de5ce42bdec77db69dc229a2f5c7367b28a560
2019-08-30 12:33:40 -07:00
Aurimas Liutikas
48d66161b9 [automerger skipped] Merge "Add missing nullability annotations." am: 9b361c2674 -s ours
am: b3c5131dcb -s ours
am skip reason: change_id I109260842cfc25f06e40694997fcbb4afa02c867 with SHA1 3a78d9db46 is in history

Change-Id: I729acc32ce9625df646bf0a820f9f4d95a9d60cf
2019-08-30 12:08:42 -07:00
Aurimas Liutikas
b3c5131dcb [automerger skipped] Merge "Add missing nullability annotations."
am: 9b361c2674 -s ours
am skip reason: change_id I109260842cfc25f06e40694997fcbb4afa02c867 with SHA1 3a78d9db46 is in history

Change-Id: I7b2712e4ab3635f94f8257d88f24c20bc68a3ac0
2019-08-30 11:49:09 -07:00
Aurimas Liutikas
d81733edf9 [automerger skipped] Merge "Add missing nullability annotations." into stage-aosp-master am: 85c0a5a2be am: 88be2b2667 am: aa02c3d5b8
am: 488d37b2d0 -s ours
am skip reason: change_id I109260842cfc25f06e40694997fcbb4afa02c867 with SHA1 8ff316034a is in history

Change-Id: Ifdf538d94799e4978a0b62fac63bd128fc2e1b5b
2019-08-30 09:04:37 -07:00
Aurimas Liutikas
aa02c3d5b8 Merge "Add missing nullability annotations." into stage-aosp-master am: 85c0a5a2be
am: 88be2b2667

Change-Id: I202951d51820be47b9195734601830553215bdd7
2019-08-30 08:43:01 -07:00
Aurimas Liutikas
88be2b2667 Merge "Add missing nullability annotations." into stage-aosp-master
am: 85c0a5a2be

Change-Id: Ic9ea2b9840fbb678bbb6ab77038415581feba918
2019-08-30 08:35:52 -07:00
Aurimas Liutikas
8bc65d215c 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
8ff316034a 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
3a78d9db46 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
Xin Li
df3d718d4d [automerger skipped] DO NOT MERGE - Merge qt-dev-plus-aosp-without-vendor (5713463) into stage-aosp-master am: 111584b14c -s ours am: d7dec84e0c am: 52a49fafb8
am: 3716431550 -s ours
am skip reason: subject contains skip directive

Change-Id: I9a9ad1d7396ff0d6ef39ccfb03cd50161e61ea8a
2019-08-15 18:46:30 -07:00
Xin Li
52a49fafb8 [automerger skipped] DO NOT MERGE - Merge qt-dev-plus-aosp-without-vendor (5713463) into stage-aosp-master am: 111584b14c -s ours
am: d7dec84e0c

Change-Id: Ib875870cdd045beff56e16ff2357df404ae76270
2019-08-15 17:29:17 -07:00
Xin Li
d7dec84e0c [automerger skipped] DO NOT MERGE - Merge qt-dev-plus-aosp-without-vendor (5713463) into stage-aosp-master
am: 111584b14c -s ours
am skip reason: subject contains skip directive

Change-Id: Ibb510ec02656e59b851599f88ae31c6e10377fca
2019-08-15 16:35:23 -07:00
Xin Li
111584b14c DO NOT MERGE - Merge qt-dev-plus-aosp-without-vendor (5713463) into stage-aosp-master
Bug: 134405016
Change-Id: I303c0268e8e454b0f0f460eb286812a50c9add88
2019-08-14 12:04:06 -07:00
Remi NGUYEN VAN
803a958445 Merge "Extract test utilities for ConnectivityService" am: b7d270a73e am: b374d3953c am: 0e84cb5bfa am: 1563afc646
am: e2967d9830

Change-Id: I0bb8a965d11e9f16ac70f62a2319e1dc8e7544df
2019-08-06 16:31:01 -07:00
Remi NGUYEN VAN
1563afc646 Merge "Extract test utilities for ConnectivityService" am: b7d270a73e am: b374d3953c
am: 0e84cb5bfa

Change-Id: Ib760ef922a440d54bab8c1647d8444ab2a717094
2019-08-06 15:57:04 -07:00
Remi NGUYEN VAN
0e84cb5bfa Merge "Extract test utilities for ConnectivityService" am: b7d270a73e
am: b374d3953c

Change-Id: Idfea637a9fd071c8fa62798bf8e3b9f241bc6348
2019-08-06 15:33:53 -07:00
Remi NGUYEN VAN
b374d3953c Merge "Extract test utilities for ConnectivityService"
am: b7d270a73e

Change-Id: I0ac2a480f961bb6fd1d83dedad6a7942ee03858f
2019-08-06 14:58:43 -07:00
Remi NGUYEN VAN
a18a355536 Extract test utilities for ConnectivityService
The utilities help using ConnectivityService in tests, and will be used
to write integration tests for ConnectivityService.

Test: atest FrameworksNetTests
Change-Id: Ie895ad05139cd5768d3d8a9bd5589d72571f47e6
2019-08-01 16:32:30 +09:00
Xiangyu/Malcolm Chen
6af6fd916e Merge changes from topic "135105735" into qt-r1-dev am: 896cdfa547
am: e0f8c07335

Change-Id: I02bdf3635298cc331e5b3bd794df772b759463ab
2019-07-12 11:03:22 -07:00
Xiangyu/Malcolm Chen
e0f8c07335 Merge changes from topic "135105735" into qt-r1-dev
am: 896cdfa547

Change-Id: Ie661fdc8a29645fa1b319cf1db8a896a8d21deae
2019-07-12 10:43:52 -07:00
Malcolm Chen
5069dbeaab Use new API to get mergedSubscriberIds based on grouping.
In addition, make mMergedSubscriberIds a list to fit usage of multi-SIM
devices.

Bug: 135105735
Bug: 137137221
Test: manual
Change-Id: I364262559789112f35b88f4c298463bf4af2e82a
2019-07-11 13:19:54 -07:00
Xin Li
cc39893d2b [automerger skipped] DO NOT MERGE - Merge pie-platform-release (PPRL.190705.004) into master am: a1e7984084 -s ours am: c565453be9 -s ours am: 1f8ab532af
am: 625b0e195b -s ours
am skip reason: subject contains skip directive

Change-Id: I826119b834739848220e8b243e5c1fbe6cbde2a3
2019-07-10 23:24:38 -07:00
Xin Li
625b0e195b [automerger skipped] DO NOT MERGE - Merge pie-platform-release (PPRL.190705.004) into master am: a1e7984084 -s ours am: c565453be9 -s ours
am: 1f8ab532af

Change-Id: I96ecd52959d20c7ebbbf662889ea2babd6e21b1b
2019-07-10 22:50:22 -07:00
Xin Li
1f8ab532af [automerger skipped] DO NOT MERGE - Merge pie-platform-release (PPRL.190705.004) into master am: a1e7984084 -s ours
am: c565453be9 -s ours
am skip reason: subject contains skip directive

Change-Id: I789e380a0d5458c07533bf67f4771d7ae6dc82ea
2019-07-10 22:14:19 -07:00
Xin Li
c565453be9 [automerger skipped] DO NOT MERGE - Merge pie-platform-release (PPRL.190705.004) into master
am: a1e7984084 -s ours
am skip reason: subject contains skip directive

Change-Id: Ida5e78dda30bfc7e9a0a76a2f85cc97e789ced82
2019-07-10 21:20:46 -07:00
Xin Li
a1e7984084 DO NOT MERGE - Merge pie-platform-release (PPRL.190705.004) into master
Bug: 136196576
Change-Id: I481d824726ae0260b42cd7a4acc1c6fce593c324
2019-07-09 15:13:36 -07:00
android-build-team Robot
c7fd0e0131 Snap for 5622519 from b869620327dabaebe715a7d8fb3d12cdddd5a221 to pi-platform-release
Change-Id: I77f90a13ae9a3897eeffcc49b91ab9088f5d8001
2019-07-08 23:28:48 +00:00
Xin Li
8dc49bcd58 [automerger skipped] Merge "DO NOT MERGE - Merge qt-dev-plus-aosp-without-vendor (5699924) into stage-aosp-master" into stage-aosp-master am: 3f1f8d1315 -s ours am: 084a82cd1a
am: d5201355aa -s ours
am skip reason: subject contains skip directive

Change-Id: Ic4317935d90aaef3225f6ae4d4caa518a8a06a10
2019-07-02 16:55:25 -07:00
Maciej Zenczykowski
56d8486eea [automerger skipped] Merge "Fix mobile data usage didn't get increased for xlat464 traffic" into qt-dev am: 2c74b2e5d8 -s ours am: 84f11755d6 -s ours
am: a22218b772 -s ours
am skip reason: change_id I8ebbefbe4df00e40f4896a17fa52c8438d41286e with SHA1 9bf1e821f5 is in history

Change-Id: Ia244b8a8529dbb267ff28a76c643e283d3feab26
2019-07-02 15:58:17 -07:00
Xin Li
d5201355aa [automerger skipped] Merge "DO NOT MERGE - Merge qt-dev-plus-aosp-without-vendor (5699924) into stage-aosp-master" into stage-aosp-master am: 3f1f8d1315 -s ours
am: 084a82cd1a

Change-Id: Ic8ef53936a2a91dc915a5e5d967ef72be50ad15c
2019-07-02 14:24:20 -07:00
Maciej Zenczykowski
92916bf4a8 [automerger skipped] Merge "Fix mobile data usage didn't get increased for xlat464 traffic" into qt-dev am: 2c74b2e5d8 -s ours am: e6e7d93808 -s ours
am: 0741d47a2d -s ours
am skip reason: change_id I8ebbefbe4df00e40f4896a17fa52c8438d41286e with SHA1 96fe3f5ff6 is in history

Change-Id: I87c4f2a4d66b6f190c95a28219a75d290cb3cfd0
2019-07-02 14:21:05 -07:00
Maciej Zenczykowski
a22218b772 [automerger skipped] Merge "Fix mobile data usage didn't get increased for xlat464 traffic" into qt-dev am: 2c74b2e5d8 -s ours
am: 84f11755d6 -s ours
am skip reason: change_id I8ebbefbe4df00e40f4896a17fa52c8438d41286e with SHA1 96fe3f5ff6 is in history

Change-Id: I9678ef008af3682687fe692cf98bb78e46f09748
2019-07-02 14:07:34 -07:00
Xin Li
084a82cd1a [automerger skipped] Merge "DO NOT MERGE - Merge qt-dev-plus-aosp-without-vendor (5699924) into stage-aosp-master" into stage-aosp-master
am: 3f1f8d1315 -s ours
am skip reason: subject contains skip directive

Change-Id: I1a32cee69d0edcb92d81a4bb8e6f98912d86a735
2019-07-02 12:40:14 -07:00
Maciej Zenczykowski
0741d47a2d [automerger skipped] Merge "Fix mobile data usage didn't get increased for xlat464 traffic" into qt-dev am: 2c74b2e5d8 -s ours
am: e6e7d93808 -s ours
am skip reason: change_id I8ebbefbe4df00e40f4896a17fa52c8438d41286e with SHA1 96fe3f5ff6 is in history

Change-Id: I78ea7922a88791b43eb0c8bc337443f128213c63
2019-07-02 12:34:36 -07:00
Maciej Zenczykowski
e6e7d93808 [automerger skipped] Merge "Fix mobile data usage didn't get increased for xlat464 traffic" into qt-dev
am: 2c74b2e5d8 -s ours
am skip reason: change_id I8ebbefbe4df00e40f4896a17fa52c8438d41286e with SHA1 96fe3f5ff6 is in history

Change-Id: Ia76c06513e23c4052262c8ac4c7212a548267a8c
2019-07-02 12:24:42 -07:00
Maciej Zenczykowski
84f11755d6 [automerger skipped] Merge "Fix mobile data usage didn't get increased for xlat464 traffic" into qt-dev
am: 2c74b2e5d8 -s ours
am skip reason: change_id I8ebbefbe4df00e40f4896a17fa52c8438d41286e with SHA1 e5e15aee20 is in history

Change-Id: If50b9304e64a5d4c18c78d933c121d428d660d61
2019-07-02 12:24:41 -07:00
junyulai
74c2572b56 [automerger skipped] Fix mobile data usage didn't get increased for xlat464 traffic am: 96fe3f5ff6 -s ours
am: e7424f5646 -s ours
am skip reason: change_id I8ebbefbe4df00e40f4896a17fa52c8438d41286e with SHA1 e5e15aee20 is in history

Change-Id: Ie5da6e781d039900cb44c596424338946a359713
2019-07-02 10:14:59 -07:00
junyulai
e7424f5646 [automerger skipped] Fix mobile data usage didn't get increased for xlat464 traffic
am: 96fe3f5ff6 -s ours
am skip reason: change_id I8ebbefbe4df00e40f4896a17fa52c8438d41286e with SHA1 e5e15aee20 is in history

Change-Id: I179221edf5fe58a1b4b747bd51f86a569ed051b4
2019-07-02 08:54:31 -07:00
junyulai
9bf1e821f5 Fix mobile data usage didn't get increased for xlat464 traffic
Interface stats on stacked interfaces is usually clatd. For
xt_qtaguid supported device, the stats is already accounted
against its final egress interface by the kernel.
Framework side does not need to handle stats on statcked
interface at all.

However, on devices that support BPF offload, xlat464
packets are seen by the iptables rules as arriving on stack
interface only. Thus, add stack interface into accounting is
needed.

Bug: 136193260
Test: 1. atest FrameworksNetTests
      2. atest android.app.usage.cts.NetworkUsageStatsTest
      3. manual test on ipv6-only wifi network

Merged-In: I8ebbefbe4df00e40f4896a17fa52c8438d41286e
Change-Id: I8ebbefbe4df00e40f4896a17fa52c8438d41286e
(cherry-pick from aosp/1009306)
(cherry picked from commit feb79bd0d7c5ecc7ac5ba9f54ed2d51ee9fd7e74)
2019-07-02 09:57:45 +00:00
TreeHugger Robot
3f1f8d1315 Merge "DO NOT MERGE - Merge qt-dev-plus-aosp-without-vendor (5699924) into stage-aosp-master" into stage-aosp-master 2019-07-02 07:41:13 +00:00
Maciej Żenczykowski
a9b818b195 Merge "Fix mobile data usage didn't get increased for xlat464 traffic" am: e284b30c81 am: e74fb60c29 am: 854c2786ae
am: bb99759252

Change-Id: If3c708e0ccd5e660c9b0f0a351ce304c0cb7dd61
2019-07-01 22:10:37 -07:00
Maciej Żenczykowski
bb99759252 Merge "Fix mobile data usage didn't get increased for xlat464 traffic" am: e284b30c81 am: e74fb60c29
am: 854c2786ae

Change-Id: If8c252038d86ffb9d60de27d50994a2ebcca8408
2019-07-01 21:52:01 -07:00
junyulai
96fe3f5ff6 Fix mobile data usage didn't get increased for xlat464 traffic
Interface stats on stacked interfaces is usually clatd. For
xt_qtaguid supported device, the stats is already accounted
against its final egress interface by the kernel.
Framework side does not need to handle stats on statcked
interface at all.

However, on devices that support BPF offload, xlat464
packets are seen by the iptables rules as arriving on stack
interface only. Thus, add stack interface into accounting is
needed.

Bug: 136193260
Test: 1. atest FrameworksNetTests
      2. atest android.app.usage.cts.NetworkUsageStatsTest
      3. manual test on ipv6-only wifi network

Merged-In: I8ebbefbe4df00e40f4896a17fa52c8438d41286e
Change-Id: I8ebbefbe4df00e40f4896a17fa52c8438d41286e
(cherry-pick from aosp/1009306)
2019-07-02 04:34:33 +00:00
Maciej Żenczykowski
854c2786ae Merge "Fix mobile data usage didn't get increased for xlat464 traffic" am: e284b30c81
am: e74fb60c29

Change-Id: I670c09dd9aaf0e440a2e43b01cf1d94edbca28b7
2019-07-01 21:31:42 -07:00
junyulai
e5e15aee20 Fix mobile data usage didn't get increased for xlat464 traffic
Interface stats on stacked interfaces is usually clatd. For
xt_qtaguid supported device, the stats is already accounted
against its final egress interface by the kernel.
Framework side does not need to handle stats on statcked
interface at all.

However, on devices that support BPF offload, xlat464
packets are seen by the iptables rules as arriving on stack
interface only. Thus, add stack interface into accounting is
needed.

Bug: 136193260
Test: 1. atest FrameworksNetTests
      2. atest android.app.usage.cts.NetworkUsageStatsTest
      3. manual test on ipv6-only wifi network

Change-Id: I8ebbefbe4df00e40f4896a17fa52c8438d41286e
2019-07-01 14:17:47 -07:00
Lorenzo Colitti
10db7f01f6 Merge "Remove all static members from NetworkStatsFactory." am: 63f94f411b am: 5409264cee am: 05f0587ca2
am: 0f3466c1a4

Change-Id: I83c93bb4fbd0302fe31c38a1dcbf6691d0043be3
2019-06-27 20:14:02 -07:00
Lorenzo Colitti
0f3466c1a4 Merge "Remove all static members from NetworkStatsFactory." am: 63f94f411b am: 5409264cee
am: 05f0587ca2

Change-Id: I7f787d14b7c7dee7a77dbed84266f8192c21c446
2019-06-27 19:56:01 -07:00
Lorenzo Colitti
05f0587ca2 Merge "Remove all static members from NetworkStatsFactory." am: 63f94f411b
am: 5409264cee

Change-Id: Iada14a1fea74197014e75a1112c7a5b35d6b1a1d
2019-06-27 19:40:01 -07:00
Lorenzo Colitti
5cdb65627f Merge "Transfer ownership of NetworkStatsFactory to NetworkStatsService." am: bd94f0afd2 am: 92292f556b am: f189d8ee94
am: 468053d2ea

Change-Id: Iebaa91b450f1c43a978e96a15e409423e3ef6bb7
2019-06-27 12:22:55 -07:00