Commit graph

7,103 commits

Message SHA1
Merge "Add missing nullability annotations." into stage-aosp-master
Aurimas Liutikas   authored and   Android (Google) Code Review   commited 2019-08-30 15:19:45 +00:00
9fe20bf048
Merge "Run callbacks on ConnectivityService thread"
am: 08e1dae42f

Change-Id: I7a8d035ec7453c5351eb2646c631c19964cb0f88

Remi NGUYEN VAN   authored and   android-build-merger   commited 2019-08-30 03:36:26 -07:00
904ee8f635
Merge "Run callbacks on ConnectivityService thread"
Treehugger Robot   authored and   Gerrit Code Review   commited 2019-08-30 10:18:28 +00:00
08e1dae42f
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

Aurimas Liutikas   commited 2019-08-30 00:14:44 +00:00
8fae993514
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

Remi NGUYEN VAN   commited 2019-08-28 10:10:04 +09:00
96521fb87d
Merge changes I69cdbb16,I6975e0b7
am: d889cb5098

Change-Id: I3c8ddf7809a0d443587c1c4c06ef56ac302fc80f

Lorenzo Colitti   authored and   android-build-merger   commited 2019-08-27 03:31:02 -07:00
c3a98bbd65
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>

wangmingming1   authored and   Lorenzo Colitti   commited 2019-08-26 09:30:59 +09:00
478ba7a6d9
Merge "avoid generating reserved local MACs"
am: 464e1b5e6f

Change-Id: Ia6d0eb0c5e8101d9c4b4bc63de79157f7d1c2284

Oscar Shu   authored and   android-build-merger   commited 2019-08-23 02:24:15 -07:00
6fcb2696cd
Merge "avoid generating reserved local MACs"
Oscar Shu   authored and   Gerrit Code Review   commited 2019-08-21 17:45:00 +00:00
464e1b5e6f
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

xshu   commited 2019-08-16 10:20:22 -07:00
8438a85683
Merge "Get resource based on subId for multi-SIM"
am: 55752cf8d4

Change-Id: I020c2546fa4432d05cf27b20fdb1943508aac671

Chiachang Wang   authored and   android-build-merger   commited 2019-08-14 04:30:57 -07:00
85ff8a6902
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

Chiachang Wang   commited 2019-08-14 13:56:37 +08:00
5fed8d9ee3
Merge "Extract test utilities for ConnectivityService"
am: ecaff61c4b

Change-Id: I0ac2a480f961bb6fd1d83dedad6a7942ee03858f

Remi NGUYEN VAN   authored and   android-build-merger   commited 2019-08-06 14:58:43 -07:00
9e23af5f90
Merge "Extract test utilities for ConnectivityService"
Treehugger Robot   authored and   Gerrit Code Review   commited 2019-08-06 11:04:36 +00:00
ecaff61c4b
Merge "Fix null pointer exception of calling NetworkInfo.mState.name()"
am: 95d62d8e55

Change-Id: Ic003b658854f9407ed8024771c6219df2b6e3806

Chalard Jean   authored and   android-build-merger   commited 2019-08-02 13:25:36 -07:00
a61bb686ae
Merge "Fix null pointer exception of calling NetworkInfo.mState.name()"
Chalard Jean   authored and   Gerrit Code Review   commited 2019-08-02 19:56:10 +00:00
95d62d8e55
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

Remi NGUYEN VAN   commited 2019-08-01 16:32:30 +09:00
0d0eb15091
Fix null pointer exception of calling NetworkInfo.mState.name()
Remove setting nai.networkInfo as null temporarily to identify the new
created NetworkAgent, avoiding timing issue triggered by constructor
NetworkInfo(null).

Bug: 135569043
Test: Mannual test, network can work normally
Change-Id: I123ef9e97df2bccdd9528c0e894283c66d053890

Yintang Gu   authored and   JeiFeng Lee   commited 2019-07-31 11:07:37 +08:00
5014b52a5f
[automerger skipped] DO NOT MERGE - Merge pie-platform-release (PPRL.190705.004) into master
am: 1354864491 -s ours
am skip reason: subject contains skip directive

Change-Id: Ida5e78dda30bfc7e9a0a76a2f85cc97e789ced82

Xin Li   authored and   android-build-merger   commited 2019-07-10 21:20:46 -07:00
f36ebb71a8
DO NOT MERGE - Merge pie-platform-release (PPRL.190705.004) into master
Bug: 136196576
Change-Id: I481d824726ae0260b42cd7a4acc1c6fce593c324

Xin Li   commited 2019-07-09 15:13:36 -07:00
1354864491
Return NonNull and other imports
Change-Id: Ia38b13209b45d8228ac02f06663e4dc12be9de60

Fedor Kudasov   commited 2019-07-09 14:19:04 +00:00
26f1ab857b
Merge changes from topic "fix_master_build"
am: 2e5319117a

Change-Id: If49999e7ce6149e847a678b03ccf8b4549f8365b

Fedor Kudasov   authored and   android-build-merger   commited 2019-07-09 06:10:01 -07:00
da2257cea2
Revert "Cherry-pick the relevant parts of master change"
This reverts commit 5a4844e307.

Reason for revert: multiple build breakages b/137069068

Change-Id: If48bfa2d2cab0877a053743b3ec53820d0c4ed6b

Fedor Kudasov   authored and   Chalard Jean   commited 2019-07-09 09:29:17 +00:00
2559cb3953
Revert "Remove providesRoutesToMostDestinations."
This reverts commit 92bd90fa0b.

Reason for revert: multiple build breakages b/137069068

Change-Id: I60a4f71e13fe82f970b177a07c0b58439cbc64ff

Fedor Kudasov   commited 2019-07-09 09:23:25 +00:00
496a313f47
Merge changes Ia43f8811,I7de4f672
am: 3ef04b8e3c

Change-Id: Ifcacd81d343a29b17fdb79f4c8b54c89a293a2b8

Chalard Jean   authored and   android-build-merger   commited 2019-07-09 00:56:57 -07:00
4896785b0b
Snap for 5622519 from b869620327dabaebe715a7d8fb3d12cdddd5a221 to pi-platform-release
Change-Id: I77f90a13ae9a3897eeffcc49b91ab9088f5d8001

android-build-team Robot   commited 2019-07-08 23:28:48 +00:00
468cc3a375
Merge "Refactor TestNetworkCallback out of ConnectivityServiceTest."
am: b268cb5c6e

Change-Id: I44b66d1d606c5bb454ae49de234cfa0dbbb2bed2

Chalard Jean   authored and   android-build-merger   commited 2019-07-08 14:00:56 -07:00
17f89499ea
Remove providesRoutesToMostDestinations.
This function is not used any more.

Test: FrameworksNetTests
Change-Id: Ia43f8811cb9d575e16735b0f4b76d91e7cd42ebc

Chalard Jean   commited 2019-07-08 20:36:33 +09:00
92bd90fa0b
Cherry-pick the relevant parts of master change
I566437e4fe10e1346858149120c50b3c20ca073f to avoid a conflict

Test: atest FrameworksNetTests
Change-Id: I7de4f67234bf97d58bddffa22272c7670398f56d

Chalard Jean   commited 2019-07-08 20:25:45 +09:00
5a4844e307
Refactor TestNetworkCallback out of ConnectivityServiceTest.
TestableNetworkCallback will become a standard tool. This patch
and its companion in packages/modules/NetworkStack mostly move
it out of ConnectivityServiceTest, but also applies a few
cleanups like reordering arguments for standard order, renaming
...Like to ...That to match Mockito namings, and introduces
stonger static typing on some callbacks, which allows to remove
some unchecked casts.

Test: atest FrameworksNetTests NetworkStackTests
Change-Id: I808a95ac33ec0c81a8829cad36a6917524297574

Chalard Jean   commited 2019-07-04 16:12:40 +09:00
9ce1e28788
Merge "Correct FrameworksNetTests-jni-defaults lib"
am: fa71b4f4a0

Change-Id: I53ca8c198b9d4bb0e743ee5010469a7375dc3cc4

Paul Hu   authored and   android-build-merger   commited 2019-07-02 10:23:03 -07:00
8bb71707e0
Correct FrameworksNetTests-jni-defaults lib
FrameworksNetTests-jni-defaults lib should only contain jni
dependencies. Remove static_libs/libs from it and update
FrameworksNetTests/FrameworksNetSmokeTests libs as well.

Bug: NA
Test: atest FrameworksNetSmokeTests FrameworksNetTests
Change-Id: I705e949e4c00035c9734b6a240529d1c2216eb6b

paulhu   authored and   Paul Hu   commited 2019-07-01 09:29:13 +00:00
a1dbf5b964
Merge "Unit tests for new explicitlySelected behaviour." am: d1379a4a80
am: 10c1a704c0

Change-Id: Id77a5d6a58e7ab4fdaa0b7c15b824270863b83fd

Lorenzo Colitti   authored and   android-build-merger   commited 2019-06-29 02:01:55 -07:00
c3bb7285f4
Merge "Simplify Exception expressions in CSTest" am: 763d449493
am: cb5aa75dd9

Change-Id: Iae16e8d68e2b1b9a1e5aa86170177c68b22cd7b5

Chalard Jean   authored and   android-build-merger   commited 2019-06-28 08:57:18 -07:00
111dc6853a
Unit tests for new explicitlySelected behaviour.
ag/7905088 added the ability to pass in acceptUnvalidated without
passing in explicitlySelected. Add unit tests for that code.

While I'm at it, convert a couple of "== 1"s to toBool(), and
update the comments in NetworkAgent.

Bug: 130766237
Test: atest FrameworksNetTests
Change-Id: I6b550bd621e3596975f83464c7b4b8a14269120b

Lorenzo Colitti   commited 2019-06-28 23:57:22 +09:00
f255e047b7
Merge "Simplify Exception expressions in CSTest"
Chalard Jean   authored and   Gerrit Code Review   commited 2019-06-28 07:19:20 +00:00
763d449493
Simplify Exception expressions in CSTest
Test: CSTest
Change-Id: Ie9b9fc334b85836bf156bda71e54e8d30885b82a

Chalard Jean   commited 2019-06-28 14:22:30 +09:00
484c4219d9
Merge "Remove all static members from NetworkStatsFactory." am: 63f94f411b
am: 5409264cee

Change-Id: Iada14a1fea74197014e75a1112c7a5b35d6b1a1d

Lorenzo Colitti   authored and   android-build-merger   commited 2019-06-27 19:40:01 -07:00
21ea4bcc96
Merge "Revert "Simplify Exception expressions in CSTest"" am: 0fd0e96a40
am: 60422b8e88

Change-Id: I80d94fa746d533a83e3ce01377dabd2aab0c3229

Chalard Jean   authored and   android-build-merger   commited 2019-06-27 02:53:23 -07:00
e2eb03b140
Remove all static members from NetworkStatsFactory.
NetworkStatsFactory is owned by NetworkStatsService, and any
accesses to NSF data should go through NSS.

Test: atest FrameworksNetTests
Change-Id: Idbd0dbbaeb11313f63474e7ec0e01f974349fc89

Lorenzo Colitti   commited 2019-06-27 17:39:05 +09:00
c75633460e
Merge "Transfer ownership of NetworkStatsFactory to NetworkStatsService." am: c657dd301f
am: 92292f556b

Change-Id: If897c9c95fc8571949183c45a99a5c28cb032ebb

Lorenzo Colitti   authored and   android-build-merger   commited 2019-06-27 01:31:46 -07:00
fbac9eefb8
Merge "Revert "Simplify Exception expressions in CSTest""
Chalard Jean   authored and   Gerrit Code Review   commited 2019-06-27 08:30:57 +00:00
0fd0e96a40
Revert "Simplify Exception expressions in CSTest"
This reverts commit d209586554.

Reason for revert: Breaks the build because it removes an unused method that was used by a change intervening in the mean time

Bug: 136143444
Change-Id: Id3a17e0b16ec03276609ca96fb7b582188ed1077

Chalard Jean   commited 2019-06-27 08:30:05 +00:00
de6bb3e852
Merge "Simplify Exception expressions in CSTest" am: afbf997ad5
am: 8e3bf0f8e3

Change-Id: I32182775bf36918438868c5b77d8d1aa995c788a

Chalard Jean   authored and   android-build-merger   commited 2019-06-27 01:11:02 -07:00
c421078227
Merge "Unify assertThrows" am: 0272942bca
am: 3f21f94616

Change-Id: If349f647b34a71bc4eb1ba25ca18d543437eb969

Chalard Jean   authored and   android-build-merger   commited 2019-06-27 01:05:16 -07:00
546cdc06f8
Merge "Transfer ownership of NetworkStatsFactory to NetworkStatsService."
Lorenzo Colitti   authored and   Gerrit Code Review   commited 2019-06-27 07:53:30 +00:00
c657dd301f
Merge "Simplify Exception expressions in CSTest"
Chalard Jean   authored and   Gerrit Code Review   commited 2019-06-27 07:09:36 +00:00
afbf997ad5
Merge "Unify assertThrows"
Chalard Jean   authored and   Gerrit Code Review   commited 2019-06-27 07:08:59 +00:00
0272942bca
Transfer ownership of NetworkStatsFactory to NetworkStatsService.
NetworkStatsService is the only consumer of the data coming from
NetworkStatsFactory, but the factory itself is instantiated and
owned by NetworkManagementService.

Move it into NetworkStatsService instead.

Test: atest FrameworksNetTests
Change-Id: I52df1e545c646927952579da22845a12d1d7563b

Lorenzo Colitti   commited 2019-06-26 19:29:51 +09:00
f5af7fcf16
[automerger skipped] Merge "Only show "Connected" note after opening portal" into qt-dev
am: 09a8de5530 -s ours
am skip reason: change_id I99be7d312d020d242081971c7e522023bbbab072 with SHA1 844ea18005 is in history

Change-Id: I50b62b92261b7386d7a15ab0e876661e8c4b0bac

Remi NGUYEN VAN   authored and   android-build-merger   commited 2019-06-26 00:59:40 -07:00
203bde59b4