Commit Graph

8168 Commits

Author SHA1 Message Date
Chalard Jean
48c6b7f68c Merge "Add tests for the legacy broadcast"
am: 48127ba387

Change-Id: I9fa07add080b3336cbf539d406220c9906e0adfe
2019-11-19 15:28:06 -08:00
Artur Satayev
e100a72cbc Merge "Add @UnsupportedAppUsage annotations for greylist." 2019-11-19 15:05:51 +00:00
Artur Satayev
32958fcc98 Add @UnsupportedAppUsage annotations for greylist.
go/cleanup-greylist-txt

These have already been greylisted, however due to bugs/omissions in the tooling have been kept in go/greylist-txt instead of being annotated in the code.

This is partial merge of aosp/Id6c1f5e403a0e66edb1102ee45f3bf19f244fb09. Telephony greylist cleanup has been done separately. Note that annotations outside of frameworks/base/ have been merged from AOSP.

Bug: 137350495
Test: m
Exempt-From-Owner-Approval: merge
Change-Id: I015c466e8b69cc0fed5e9d394ba865aad11d8ba6
2019-11-19 15:05:35 +00:00
Chalard Jean
7c10ed5e9b Rename waitForConnectivityBroadcast
This doesn't wait, so it was ill-named.
Test: ConnectivityServiceTest

Change-Id: I15e5083f961e415b1d2d870e49c177fc84f0312c
2019-11-19 22:41:09 +09:00
Chalard Jean
dd8adb9866 [NS A02] Move the contents of mNetworkForRequestId to NRIs
The member will be removed in a subsequent change

Bug: 113554781
Test: ConnectivityServiceTest
Change-Id: I2379e47b1a97fb939b8558c01547d3d704f0f628
2019-11-19 22:41:09 +09:00
Chalard Jean
2c8b3e302f [NS A01] Add checks for the handler thread
This is a preliminary step to removing mNetworkForRequestId, whose
role could be better managed by storing the network inside the NRI.
This serves two purposes :
1. It is a sanity check. Those functions should never be called out
of the handler thread, and if they are it's a bug.
2. It will serve to prove the followup changes are correct.

Bug: 113554781
Test: ConnectivityServiceTest
Change-Id: If29066839ad640121d33f231abdd4f37d0ad3fd5
2019-11-19 22:41:09 +09:00
Chalard Jean
48127ba387 Merge "Add tests for the legacy broadcast" 2019-11-19 13:32:17 +00:00
Chalard Jean
4aa9d9d859 Add tests for the legacy broadcast
Test: this
Change-Id: I0777bf443f65d894eaab9b800db40c1caf6520fe
2019-11-19 21:08:44 +09:00
paulhu
c62d3c22df Adjust PermissionMonitor#startMonitoring in ConnectivityService
Let PermissionMonitor#startMonitoring() running in the beginning
of the ConnectivityService#systemReady() before
MultipathPolicyTracker.start(). Since mApps in PermissionMonitor
needs to be populated first to ensure that listening network
request which is sent by MultipathPolicyTracker won't be added
NET_CAPABILITY_FOREGROUND capability.

Bug: 135897744
Test: atest FrameworksNetTests
Change-Id: Ibef8e7b0017a77384630d34c9edc6c40875f773e
2019-11-19 17:55:31 +08:00
Roshan Pius
615462b9f2 Merge "StaticIpConfiguration: Couple of minor fixes" am: 90a81fedc5 am: a215878d38
am: 7aa5f04e7f

Change-Id: I66a1e125c1ecfa456ae7e83153dfc02eb7d7d3b0
2019-11-18 07:17:43 -08:00
Roshan Pius
7aa5f04e7f Merge "StaticIpConfiguration: Couple of minor fixes" am: 90a81fedc5
am: a215878d38

Change-Id: Ic40a6d4221cdb39e40b895efbe313160b7ab0846
2019-11-18 07:14:08 -08:00
Roshan Pius
a215878d38 Merge "StaticIpConfiguration: Couple of minor fixes"
am: 90a81fedc5

Change-Id: I29469c22d25fd812590f7adca23ef83337580b2b
2019-11-18 07:10:41 -08:00
Roshan Pius
90a81fedc5 Merge "StaticIpConfiguration: Couple of minor fixes" 2019-11-18 15:05:31 +00:00
Jayachandran Chinnakkannu
368ede6dbf Merge "Remove usage of Telephonymanager getDefault() and from() hidden APIs" am: 73e22ad21d am: 01586c399e
am: 0049091605

Change-Id: Ief1f090f3664d583565f291c89357bfbac58fe17
2019-11-18 01:09:40 -08:00
Jayachandran Chinnakkannu
0049091605 Merge "Remove usage of Telephonymanager getDefault() and from() hidden APIs" am: 73e22ad21d
am: 01586c399e

Change-Id: I7613a654dd726bcf5428a5a07ad4369f616bbcfa
2019-11-18 01:05:02 -08:00
Jayachandran Chinnakkannu
01586c399e Merge "Remove usage of Telephonymanager getDefault() and from() hidden APIs"
am: 73e22ad21d

Change-Id: I555617ff893acf4c53e6a73d6591b6aaebf3ce50
2019-11-17 22:30:01 -08:00
Jayachandran C
2092850198 Remove usage of Telephonymanager getDefault() and from() hidden APIs
This CL replaces with getSystemService(TelephonyManager.class)

Bug: 140768340
Test: atest frameworks/base/tests/net
Change-Id: I0f14cc5440fa85c81ab90f3199e9e91c1b00f5e1
2019-11-15 19:26:33 -08:00
Roshan Pius
32b898bb6d StaticIpConfiguration: Couple of minor fixes
a) Ensure the Builder.build() does not crash if setDnsServers() is not
invoked.
b) Add a checkNotNull on setDnsServers() since it is marked @NonNull.

Bug: 144487020
Test: Compiles
Change-Id: I2b9f990efa0583c0f067c25e23d8c944ffbdf6a5
(cherry-picked from d0348339c50eeae0fe137c62476f6a01542f4163)
2019-11-14 18:13:26 -08:00
Artur Satayev
9abd130eeb [automerger skipped] Merge "Add @UnsupportedAppUsage to test apis that are known to be used by apps." am: a98026f7aa am: f11566d236
am: e74f099313 -s ours
am skip reason: change_id Ifc8db120640a1554dcbf1722e61e09c7ddc65dd6 with SHA1 fa065b1fc8 is in history

Change-Id: I1e9b0579e65071e042c4595083427bcc7889c15e
2019-11-13 14:05:06 -08:00
Artur Satayev
e74f099313 Merge "Add @UnsupportedAppUsage to test apis that are known to be used by apps." am: a98026f7aa
am: f11566d236

Change-Id: Ic691d764839ecf34daa8b53aa92497e013c9a2a7
2019-11-13 10:40:54 -08:00
Artur Satayev
f11566d236 Merge "Add @UnsupportedAppUsage to test apis that are known to be used by apps."
am: a98026f7aa

Change-Id: Ia39fbc2200aa7262e4a05b0710b7a382bb01b276
2019-11-13 10:33:06 -08:00
Artur Satayev
96639a6e4e Add @UnsupportedAppUsage to test apis that are known to be used by apps.
go/testapi-enforcement

Bug: 133832325
Test: m
Change-Id: Ifc8db120640a1554dcbf1722e61e09c7ddc65dd6
Merged-In: Ifc8db120640a1554dcbf1722e61e09c7ddc65dd6
2019-11-13 15:05:56 +00:00
Artur Satayev
fa065b1fc8 Add @UnsupportedAppUsage to test apis that are known to be used by apps.
go/testapi-enforcement

Bug: 133832325
Test: m
Change-Id: Ifc8db120640a1554dcbf1722e61e09c7ddc65dd6
Merged-In: Ifc8db120640a1554dcbf1722e61e09c7ddc65dd6
2019-11-13 12:58:29 +00:00
Remi NGUYEN VAN
36ca7d7f50 Merge "Add permissions to NetIntegrationTests manifest" am: 732d7f96f3 am: 29eb83b289
am: 652709eb7f

Change-Id: I33f628f9845d672edce17807f32819e31549eefd
2019-11-11 21:54:17 -08:00
Remi NGUYEN VAN
652709eb7f Merge "Add permissions to NetIntegrationTests manifest" am: 732d7f96f3
am: 29eb83b289

Change-Id: If487d15f3666af5460d886cfce78d87b6343e443
2019-11-11 21:48:51 -08:00
Remi NGUYEN VAN
29eb83b289 Merge "Add permissions to NetIntegrationTests manifest"
am: 732d7f96f3

Change-Id: Ieb22f6fa83bcc1e5c867a188f3a342980fce3203
2019-11-11 21:44:07 -08:00
Remi NGUYEN VAN
732d7f96f3 Merge "Add permissions to NetIntegrationTests manifest" 2019-11-12 05:31:19 +00:00
Artur Satayev
2291c7a5eb [automerger skipped] Merge "Add @UnsupportedAppUsage annotations for greylist." am: d57628bf9f am: 1f87149b02
am: 78a5ae9213 -s ours
am skip reason: change_id Id6c1f5e403a0e66edb1102ee45f3bf19f244fb09 with SHA1 7c3d157392 is in history

Change-Id: I49f1a2d2a16d416a305746a72ae3b266cf1d787d
2019-11-11 10:21:46 -08:00
Artur Satayev
78a5ae9213 Merge "Add @UnsupportedAppUsage annotations for greylist." am: d57628bf9f
am: 1f87149b02

Change-Id: I48075ef4296e0b55c0055f7364c5129bbd60e9ed
2019-11-11 09:33:13 -08:00
Artur Satayev
1f87149b02 Merge "Add @UnsupportedAppUsage annotations for greylist."
am: d57628bf9f

Change-Id: I5387b4742fdaf67ad3189356f2361f73969b53a8
2019-11-11 09:13:24 -08:00
Treehugger Robot
d57628bf9f Merge "Add @UnsupportedAppUsage annotations for greylist." 2019-11-11 14:27:47 +00:00
Artur Satayev
081f946033 [automerger skipped] Merge "Add @UnsupportedAppUsage annotations for max-p." am: f2016651b6 am: 1c1501f3bf
am: 8e9631adae -s ours
am skip reason: change_id I5aa29a49b193db47aaee4d3a756c17f48cc9f0b1 with SHA1 f269537490 is in history

Change-Id: I48d2d4d2b0dbf20bd2954b67909f5722cdd62a93
2019-11-08 09:55:00 -08:00
Artur Satayev
8e9631adae Merge "Add @UnsupportedAppUsage annotations for max-p." am: f2016651b6
am: 1c1501f3bf

Change-Id: Iff80c388dec2c6f8184b739be6fb38b8ec8a1a49
2019-11-08 09:49:03 -08:00
Artur Satayev
1c1501f3bf Merge "Add @UnsupportedAppUsage annotations for max-p."
am: f2016651b6

Change-Id: I2f249063c274b54a58a24cda23f1d5a60fa14540
2019-11-08 09:38:12 -08:00
Treehugger Robot
f2016651b6 Merge "Add @UnsupportedAppUsage annotations for max-p." 2019-11-08 17:26:36 +00:00
Artur Satayev
56cb6bb2a9 Add @UnsupportedAppUsage annotations for greylist.
go/cleanup-greylist-txt

These have already been greylisted, however due to bugs/omissions in the tooling have been kept in go/greylist-txt instead of being annotated in the code.

Bug: 137350495
Test: m

Change-Id: Id6c1f5e403a0e66edb1102ee45f3bf19f244fb09
Merged-In: Id6c1f5e403a0e66edb1102ee45f3bf19f244fb09
2019-11-08 16:17:13 +00:00
Artur Satayev
8124713528 Add @UnsupportedAppUsage annotations for max-p.
See go/UnsupportedAppUsage for more details.

These have already been greylisted, however due to bugs/omissions in the tooling have been kept in go/greylist-txt instead of being annotated in the code.

Bug: 137350495
Test: m
Change-Id: I5aa29a49b193db47aaee4d3a756c17f48cc9f0b1
Merged-In: I5aa29a49b193db47aaee4d3a756c17f48cc9f0b1
2019-11-08 16:17:13 +00:00
Lucas Lin
288c248dfd Merge "[NS01] Create NetworkScore" am: bd692519f4 am: 10c6d68c49
am: 95d990daef

Change-Id: Ic093e655b1ff7e44db57d7add6b0818a06700962
2019-11-07 17:05:20 -08:00
Lucas Lin
95d990daef Merge "[NS01] Create NetworkScore" am: bd692519f4
am: 10c6d68c49

Change-Id: I0ba5523bf80f949a148e53774a367de325853747
2019-11-07 16:59:11 -08:00
Lucas Lin
10c6d68c49 Merge "[NS01] Create NetworkScore"
am: bd692519f4

Change-Id: I63a76689ef468b55ad1d43db19655e8d822d0122
2019-11-07 16:53:15 -08:00
Lucas Lin
bd692519f4 Merge "[NS01] Create NetworkScore" 2019-11-08 00:47:22 +00:00
lucaslin
17e9c67315 [NS01] Create NetworkScore
It's the first patch for refounding network selection. The new
network selection will try to compare the networks by more
factors, and will try to choose the best network after doing
the evaluation of trade-off.
Create the object that will serve to represent network quality
for more comprehensive ranking.

Bug: 143676287
Test: 1. Build pass.
      2. atest FrameworksNetTests

Change-Id: I4b6071d14365aa84d06be9802516fedf527e70f7
2019-11-07 16:47:56 +08:00
Xin Li
91c9ec0c73 [automerger skipped] Merge "DO NOT MERGE - qt-qpr1-dev-plus-aosp-without-vendor@5915889 into stage-aosp-master" into stage-aosp-master am: fd24099616
am: 65dad1faa9 -s ours
am skip reason: subject contains skip directive

Change-Id: I5737c9310055502c4736dd58b38137e4119be833
2019-10-31 14:56:47 -07:00
Xin Li
65dad1faa9 Merge "DO NOT MERGE - qt-qpr1-dev-plus-aosp-without-vendor@5915889 into stage-aosp-master" into stage-aosp-master
am: fd24099616

Change-Id: I3a1d6dd3aefe1720f7b77174287357446626d1dd
2019-10-31 14:33:39 -07:00
Xin Li
65c589a1bd [automerger skipped] DO NOT MERGE - qt-qpr1-dev-plus-aosp-without-vendor@5915889 into stage-aosp-master am: 25d140454e
am: 42d2b7d42e -s ours
am skip reason: subject contains skip directive

Change-Id: I3056dd82f558502b57da97eca4524d5332f3ae5f
2019-10-31 14:02:53 -07:00
Xin Li
42d2b7d42e DO NOT MERGE - qt-qpr1-dev-plus-aosp-without-vendor@5915889 into stage-aosp-master
am: 25d140454e

Change-Id: I80dc833d1a9394dc61a09296a9dbad604c3c0a0d
2019-10-31 13:15:28 -07:00
TreeHugger Robot
fd24099616 Merge "DO NOT MERGE - qt-qpr1-dev-plus-aosp-without-vendor@5915889 into stage-aosp-master" into stage-aosp-master 2019-10-31 18:38:40 +00:00
Jeongik Cha
ae75aea69a [automerger skipped] Merge "Change AIDL module name" am: 450a38b074 am: 432fb0358b
am: f05bf24a74 -s ours
am skip reason: change_id Ib38e2cb114cc373ef50652f421ddaff9b4fbe5b9 with SHA1 fbfa7d09ff is in history

Change-Id: I70e0b81df88d09dd10f236b443cde0b4b3c52a0e
2019-10-31 00:12:31 -07:00
Jeongik Cha
f05bf24a74 Merge "Change AIDL module name" am: 450a38b074
am: 432fb0358b

Change-Id: Ib67d2e7f95592b2b94b43001f89a9413ff01dfcd
2019-10-31 00:00:11 -07:00
Xin Li
25d140454e DO NOT MERGE - qt-qpr1-dev-plus-aosp-without-vendor@5915889 into stage-aosp-master
Bug: 142003500
Change-Id: If5056a73ede668b0048ca107b686413695e5b3b6
2019-10-30 14:33:01 -07:00