Commit Graph

7538 Commits

Author SHA1 Message Date
Aurimas Liutikas
772ad4867f Merge "Add missing nullability annotations." 2019-08-30 15:14:37 +00:00
Remi NGUYEN VAN
b3899a384d Merge "Run callbacks on ConnectivityService thread" am: 1ef61592b8 am: ab507d4e34 am: bb5e40bc49 am: 49d314a21d
am: 6fb7791309

Change-Id: I382db90c318495244a42a2d4af6e5ebf54f05750
2019-08-30 04:17:08 -07:00
Remi NGUYEN VAN
6fb7791309 Merge "Run callbacks on ConnectivityService thread" am: 1ef61592b8 am: ab507d4e34 am: bb5e40bc49
am: 49d314a21d

Change-Id: I8ada7ccf94e0ade83c0d810daba9703da60a6f59
2019-08-30 04:05:18 -07:00
Remi NGUYEN VAN
49d314a21d Merge "Run callbacks on ConnectivityService thread" am: 1ef61592b8 am: ab507d4e34
am: bb5e40bc49

Change-Id: I12d7b8fca85502807288bba03417f2ceb0c9f533
2019-08-30 03:53:46 -07:00
Remi NGUYEN VAN
bb5e40bc49 Merge "Run callbacks on ConnectivityService thread" am: 1ef61592b8
am: ab507d4e34

Change-Id: I288994ccfdd044453aa818681745b8e69881264a
2019-08-30 03:47:09 -07:00
Remi NGUYEN VAN
ab507d4e34 Merge "Run callbacks on ConnectivityService thread"
am: 1ef61592b8

Change-Id: I7a8d035ec7453c5351eb2646c631c19964cb0f88
2019-08-30 03:36:26 -07:00
Treehugger Robot
1ef61592b8 Merge "Run callbacks on ConnectivityService thread" 2019-08-30 10:18:28 +00:00
Aurimas Liutikas
449a5f69c7 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
Remi NGUYEN VAN
6f7ef3f258 Run callbacks on ConnectivityService thread
Run MultinetworkPolicyTracker and DataConnectionStats callbacks on the
ConnectivityService handler thread.

Previously the callbacks would be using the SystemServer foreground
thread (Looper.myLooper()), or the broadcast thread for the
MultinetworkPolicyTracker BroadcastReceiver. This is error-prone, can
cause threading issues and makes it difficult to test the components.

Test: atest FrameworksNetTests
Change-Id: I189213dd363004abed294659165bf5430d153bba
2019-08-28 10:10:04 +09:00
Lorenzo Colitti
0cf506e318 Merge changes I69cdbb16,I6975e0b7 am: d889cb5098 am: 5fecd24f17 am: 5b943c34fd am: 48515fdc8b
am: 76891b9e72

Change-Id: Ie87981017bf2d4deef2092407c31fb3df4464dc8
2019-08-27 04:24:55 -07:00
Lorenzo Colitti
76891b9e72 Merge changes I69cdbb16,I6975e0b7 am: d889cb5098 am: 5fecd24f17 am: 5b943c34fd
am: 48515fdc8b

Change-Id: I77ca7b17bea79dee5156839d1164b0fc78b31fe5
2019-08-27 04:12:45 -07:00
Lorenzo Colitti
48515fdc8b Merge changes I69cdbb16,I6975e0b7 am: d889cb5098 am: 5fecd24f17
am: 5b943c34fd

Change-Id: Id2ef4273b32f804f2a5b935fe9a9d59424baa85a
2019-08-27 03:58:57 -07:00
Lorenzo Colitti
5b943c34fd Merge changes I69cdbb16,I6975e0b7 am: d889cb5098
am: 5fecd24f17

Change-Id: I6f6458883392a396ff831c6ddd74295e00daae0f
2019-08-27 03:44:40 -07:00
Lorenzo Colitti
5fecd24f17 Merge changes I69cdbb16,I6975e0b7
am: d889cb5098

Change-Id: I3c8ddf7809a0d443587c1c4c06ef56ac302fc80f
2019-08-27 03:31:02 -07:00
Paul Hu
38c800e217 [automerger skipped] Merge "Add SocketUtils CTS tests am: 4f4206d56f" into qt-dev-plus-aosp am: 364c77f92e am: a09c956a1c
am: 24604c9f38 -s ours
am skip reason: change_id I36252fdf516cf4a9d4506b615cdb38f5413739e5 with SHA1 6b16c42b64 is in history

Change-Id: I42f498e0596eb2dce855f0267b76b4f04c4f31aa
2019-08-26 15:16:41 -07:00
Paul Hu
0cddfcecb8 [automerger skipped] Merge "Add SocketUtils CTS tests am: 4f4206d56f am: c91dfb967b" into qt-r1-dev-plus-aosp am: f5f95fce12
am: 69dfdd247a -s ours
am skip reason: change_id I36252fdf516cf4a9d4506b615cdb38f5413739e5 with SHA1 6b16c42b64 is in history

Change-Id: Id31da8aaa8782d340d77dc81c784ee603cb2458e
2019-08-26 15:11:04 -07:00
Paul Hu
24604c9f38 Merge "Add SocketUtils CTS tests am: 4f4206d56f" into qt-dev-plus-aosp am: 364c77f92e
am: a09c956a1c

Change-Id: Ib9a37cb7def991896fba61fbefe61eb8b583a1fb
2019-08-26 14:01:10 -07:00
Paul Hu
69dfdd247a Merge "Add SocketUtils CTS tests am: 4f4206d56f am: c91dfb967b" into qt-r1-dev-plus-aosp
am: f5f95fce12

Change-Id: I26b15368b078084158ad91df5d26cea93aff8cd4
2019-08-26 13:53:50 -07:00
Paul Hu
a09c956a1c Merge "Add SocketUtils CTS tests am: 4f4206d56f" into qt-dev-plus-aosp
am: 364c77f92e

Change-Id: I99307d7aeb0e8c96de51e53a5bc373e570715860
2019-08-25 20:39:10 -07:00
Paul Hu
576bc91214 Add SocketUtils CTS tests am: 4f4206d56f
am: c91dfb967b

Change-Id: I83abe9535018a161241c4d57f69960254f310c17
2019-08-25 20:33:52 -07:00
Paul Hu
89a0034bf1 Add SocketUtils CTS tests
am: 4f4206d56f

Change-Id: I1cf2c12592f4a43a31f1e91c7a4bd933107d4f70
2019-08-25 20:21:56 -07:00
Paul Hu
c91dfb967b Add SocketUtils CTS tests
am: 4f4206d56f

Change-Id: I92a6b3e5cb1fa993dfaeacb442cbf6b401dd5996
2019-08-25 20:21:52 -07:00
wangmingming1
b020abc61c notify netd about uid internet permission changes when package replaced
1. If a previous version of an app doesn't declare internet permission;
2. The User upgraded it to a new version and the new one does declare the
internet permission;
3. The new app are not allowed to access the internet until next boot

Bug: 137864893
Test: Manual, just make sure the onPackageChanged would be executed on package changes
Change-Id: I69cdbb16a027a9c4e974b32371b1f64a23a51a23
Signed-off-by: wangmingming1 <wangmingming1@xiaomi.com>
2019-08-26 09:30:59 +09:00
Oscar Shu
e686dcfd8f Merge "avoid generating reserved local MACs" am: da8955aa2a am: 0ea945e919 am: 4f05f46f13 am: f30d01c91b
am: 83de8f4348

Change-Id: If0fdc7bd46f711714986440a9a905f2ccb154830
2019-08-24 01:33:53 -07:00
Oscar Shu
83de8f4348 Merge "avoid generating reserved local MACs" am: da8955aa2a am: 0ea945e919 am: 4f05f46f13
am: f30d01c91b

Change-Id: Ib6e9917c555ab4ef5769aaca1ef6987dfbc185c1
2019-08-23 22:03:56 -07:00
Oscar Shu
f30d01c91b Merge "avoid generating reserved local MACs" am: da8955aa2a am: 0ea945e919
am: 4f05f46f13

Change-Id: Icce1e14fae4293d747d0f9a57c99bb52fee31ba0
2019-08-23 03:14:04 -07:00
Oscar Shu
0ea945e919 Merge "avoid generating reserved local MACs"
am: da8955aa2a

Change-Id: Ia6d0eb0c5e8101d9c4b4bc63de79157f7d1c2284
2019-08-23 02:24:15 -07:00
Paul Hu
4f4206d56f Add SocketUtils CTS tests
Test APIs below:
makeNetlinkSocketAddress(int, int)
makePacketSocketAddress(short, int)
makePacketSocketAddress(int, byte[])
closeSocket(java.io.FileDescriptor)

Bug:129200596
Test: atest FrameworksNetTests
      atest CtsNetTestCases --instant
Merged-In: I36252fdf516cf4a9d4506b615cdb38f5413739e5
(cherry picked from commit 6b16c42b64)

Change-Id: I0963acaf00c5bdd93db0503c426f190f409ca076
2019-08-23 02:13:40 +00:00
Oscar Shu
da8955aa2a Merge "avoid generating reserved local MACs" 2019-08-21 17:45:00 +00:00
Chiachang Wang
0764f54bf5 Merge "[automerger skipped] Merge "Get resource based on subId for multi-SIM" into qt-r1-dev am: 559e7a3de1 am: c3c41babff -s ours
am: a0bfba8ba6 -s ours
am skip reason: change_id Ib5b085d97103889600773d269e03b939c29ca47d with SHA1 4d0479e43d is in history

Change-Id: I89c6875e66f3223a9b86ff0a721694bbaa271937
2019-08-17 07:56:18 -07:00
Chiachang Wang
8f3aa16663 [automerger skipped] Merge "Get resource based on subId for multi-SIM" into qt-r1-dev am: 559e7a3de1 am: c3c41babff -s ours
am: 3322d60ef0 -s ours
am skip reason: change_id Ib5b085d97103889600773d269e03b939c29ca47d with SHA1 4d0479e43d is in history

Change-Id: Id9ee99550980efa1f12d44dc7db30a23c7766087
2019-08-17 07:44:03 -07:00
Chiachang Wang
70de8968ec [automerger skipped] Merge "Get resource based on subId for multi-SIM" into qt-r1-dev am: 559e7a3de1 -s ours am: d4e0075b97 -s ours
am: 9e0e6dca6d -s ours
am skip reason: change_id Ib5b085d97103889600773d269e03b939c29ca47d with SHA1 113d65976b is in history

Change-Id: Ibedf0c2e42da973414f90b1250c2434c377b57e0
2019-08-17 07:37:20 -07:00
Android Build Merger (Role)
a0bfba8ba6 Merge "[automerger skipped] Merge "Get resource based on subId for multi-SIM" into qt-r1-dev am: 559e7a3de1 am: c3c41babff -s ours am skip reason: change_id Ib5b085d97103889600773d269e03b939c29ca47d with SHA1 113d65976b is in history" into qt-qpr1-dev-plus-aosp 2019-08-17 14:28:18 +00:00
Chiachang Wang
3322d60ef0 [automerger skipped] Merge "Get resource based on subId for multi-SIM" into qt-r1-dev am: 559e7a3de1
am: c3c41babff -s ours
am skip reason: change_id Ib5b085d97103889600773d269e03b939c29ca47d with SHA1 113d65976b is in history

Change-Id: If85845ae5b8af10afdb9422d92cdbf599b294d2f
2019-08-17 07:27:18 -07:00
Chiachang Wang
d4e0075b97 [automerger skipped] Merge "Get resource based on subId for multi-SIM" into qt-r1-dev
am: 559e7a3de1 -s ours
am skip reason: change_id Ib5b085d97103889600773d269e03b939c29ca47d with SHA1 113d65976b is in history

Change-Id: I405bb51787bce13441aa4c3b985ef2b92df18826
2019-08-17 07:17:49 -07:00
xshu
f6ff8b31f0 avoid generating reserved local MACs
Avoid generating WifiInfo.DEFAULT_MAC_ADDRESS as a randomized MAC
address since it's being used for another purpose.

Bug: 137796328
Test: atest MacAddressTest
Change-Id: Ia7beef0d0af5d7b39845e662cd343d81aef97702
2019-08-16 10:20:22 -07:00
Chiachang Wang
a3e4f5c790 Merge "Get resource based on subId for multi-SIM" am: 55752cf8d4 am: a784eb71ef am: 2b7f2fbb5b am: 879358bcf2
am: 953f3a62ce

Change-Id: Ief32e4d6376062ba6e86472e39d84681f562980a
2019-08-14 05:21:30 -07:00
Chiachang Wang
4d0479e43d Get resource based on subId for multi-SIM
The resource loading is done based on the last SIM to come up
which is not a deterministic design. Thus, update the way to get
the resource based on the subId.

Test: atest FrameworksNetTests
Test: manually test with avoid bad wifi feature supported sim
Bug: 138956509
Change-Id: Ib5b085d97103889600773d269e03b939c29ca47d
Merged-In: Ib5b085d97103889600773d269e03b939c29ca47d
(cherry picked from commit 5e994ea02c7a820543f3726186240548676f4b4e)
2019-08-14 12:15:56 +00:00
Chiachang Wang
879358bcf2 Merge "Get resource based on subId for multi-SIM" am: 55752cf8d4 am: a784eb71ef
am: 2b7f2fbb5b

Change-Id: I1e69a49c88f6123f735075934f2f2e08f15f2bff
2019-08-14 04:54:59 -07:00
Chiachang Wang
a784eb71ef Merge "Get resource based on subId for multi-SIM"
am: 55752cf8d4

Change-Id: I020c2546fa4432d05cf27b20fdb1943508aac671
2019-08-14 04:30:57 -07:00
Chiachang Wang
113d65976b Get resource based on subId for multi-SIM
The resource loading is done based on the last SIM to come up
which is not a deterministic design. Thus, update the way to get
the resource based on the subId.

Test: atest FrameworksNetTests
Test: manually test with avoid bad wifi feature supported sim
Bug: 138956509
Change-Id: Ib5b085d97103889600773d269e03b939c29ca47d
2019-08-14 13:56:37 +08:00
Remi NGUYEN VAN
b3fb37ea9d Merge "Extract test utilities for ConnectivityService" am: 4b9f5ddda5 am: dafaf4472f am: 6d34ffb4e6 am: f4d0e9dac9
am: e2967d9830

Change-Id: I0bb8a965d11e9f16ac70f62a2319e1dc8e7544df
2019-08-06 16:31:01 -07:00
Remi NGUYEN VAN
f4d0e9dac9 Merge "Extract test utilities for ConnectivityService" am: 4b9f5ddda5 am: dafaf4472f
am: 6d34ffb4e6

Change-Id: Ib760ef922a440d54bab8c1647d8444ab2a717094
2019-08-06 15:57:04 -07:00
Remi NGUYEN VAN
dafaf4472f Merge "Extract test utilities for ConnectivityService"
am: 4b9f5ddda5

Change-Id: I0ac2a480f961bb6fd1d83dedad6a7942ee03858f
2019-08-06 14:58:43 -07:00
Treehugger Robot
4b9f5ddda5 Merge "Extract test utilities for ConnectivityService" 2019-08-06 11:04:36 +00:00
Chalard Jean
a2aae6b56f Merge "Fix null pointer exception of calling NetworkInfo.mState.name()" am: 10f66f7af5 am: ff68da8ed9 am: c560826d4d am: d5a4435f01
am: 6f1321a7b6

Change-Id: I7f50e9a73658fefbe9877f9fbf7ec20fdacb7ecf
2019-08-02 14:19:39 -07:00
Chalard Jean
d5a4435f01 Merge "Fix null pointer exception of calling NetworkInfo.mState.name()" am: 10f66f7af5 am: ff68da8ed9
am: c560826d4d

Change-Id: Iec9e7aff73662369b5e922626494d42c025a2cb6
2019-08-02 13:57:10 -07:00
Chalard Jean
ff68da8ed9 Merge "Fix null pointer exception of calling NetworkInfo.mState.name()"
am: 10f66f7af5

Change-Id: Ic003b658854f9407ed8024771c6219df2b6e3806
2019-08-02 13:25:36 -07:00
Chalard Jean
10f66f7af5 Merge "Fix null pointer exception of calling NetworkInfo.mState.name()" 2019-08-02 19:56:10 +00:00
Artur Satayev
4510ea5101 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.

Exempted-From-Owner-Approval: Mechanical changes to the codebase
which have been approved by Android API council and announced on
android-eng@

Bug: 137350495
Test: m
Change-Id: I5aa29a49b193db47aaee4d3a756c17f48cc9f0b1
2019-08-01 19:46:29 +01:00