Treehugger Robot
71c81897d6
Merge "Roll forward: add a test for ParseException" am: 55b86dd028 am: 90d389d11f
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1679759
Change-Id: Ie86bf592435383da29eb8b53590d1e208ffd0a2b
2021-04-20 10:22:40 +00:00
Remi NGUYEN VAN
3116f6f958
Merge "Revert "Add a test for ParseException"" am: 060026feca am: 2d467a1678
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1679758
Change-Id: Ib586e908b31ccb2c2054ec99ae1be2dea4d39988
2021-04-20 10:22:30 +00:00
Treehugger Robot
90d389d11f
Merge "Roll forward: add a test for ParseException" am: 55b86dd028
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1679759
Change-Id: I17938abef561d95347869084114ee08f90d81db5
2021-04-20 10:13:47 +00:00
Treehugger Robot
55b86dd028
Merge "Roll forward: add a test for ParseException"
2021-04-20 10:03:56 +00:00
Remi NGUYEN VAN
2d467a1678
Merge "Revert "Add a test for ParseException"" am: 060026feca
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1679758
Change-Id: Ifb852d9264a6e1fc5ce82a5eb35d66459a021599
2021-04-20 09:52:35 +00:00
Treehugger Robot
39b23dc413
Merge "Update TEST_MAPPING imports for connectivity" am: e063867f7b am: da2dfee6d5
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1680905
Change-Id: I0d5d0be2d59eca6447419a92039be82a0769a5b4
2021-04-20 09:31:43 +00:00
Remi NGUYEN VAN
060026feca
Merge "Revert "Add a test for ParseException""
2021-04-20 09:25:07 +00:00
Treehugger Robot
da2dfee6d5
Merge "Update TEST_MAPPING imports for connectivity" am: e063867f7b
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1680905
Change-Id: I100470cc936fca8dba86a1ad083d4d67139b6aea
2021-04-20 09:06:31 +00:00
Remi NGUYEN VAN
8cb7d32b1a
Update TEST_MAPPING imports for connectivity
...
Connectivity CTS tests were moved from cts/tests/net to
packages/modules/Connectivity.
Bug: 185751610
Change-Id: Id4efd99c419706a52ad5d708888097bd6312d4e6
Test: treehugger is needed to test
2021-04-20 07:10:41 +00:00
Remi NGUYEN VAN
96dc675760
Roll forward: add a test for ParseException
...
The test simply creates an exception and verifies that it has the
required fields.
The constructor tests are only run on S+ as they are not part of the
API before that.
Change-Id: Ic30a34d3203c1b40923ba783a34f0cfed53a07ae
Test: atest FrameworksNetTests
2021-04-20 16:04:33 +09:00
Remi NGUYEN VAN
7696391a92
Revert "Add a test for ParseException"
...
This reverts commit 98bab00fc9 .
Reason for revert: Test broken on R: b/185751610
Change-Id: I9f5d25c0ba81011848ab3cf7ec44aa329fbb3b0f
2021-04-20 16:04:33 +09:00
Chiachang Wang
2f059d6005
Merge "Update the permission check for dump" am: 8df8f29f8b am: 1e46f3f547
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1678985
Change-Id: Id4c40e177621f39174cd4cf6cd39cc40033302b8
2021-04-19 06:18:01 +00:00
Chiachang Wang
1e46f3f547
Merge "Update the permission check for dump" am: 8df8f29f8b
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1678985
Change-Id: I48703e74bea2a878ded3850dc5be6ec12e5c8e87
2021-04-19 05:52:38 +00:00
Remi NGUYEN VAN
e3f7c9ef21
Merge "Add a test for ParseException" am: dfb51531e6 am: 3a21c84b20
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1675625
Change-Id: I17a061ba6395b03250bca4162efe2d439113e1e6
2021-04-19 05:42:08 +00:00
Chiachang Wang
8df8f29f8b
Merge "Update the permission check for dump"
2021-04-19 05:37:09 +00:00
Remi NGUYEN VAN
3a21c84b20
Merge "Add a test for ParseException" am: dfb51531e6
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1675625
Change-Id: I2ef380a3b4c2f0170c77baa11ca3cbcf10b21bed
2021-04-19 05:19:30 +00:00
Remi NGUYEN VAN
dfb51531e6
Merge "Add a test for ParseException"
2021-04-19 04:57:31 +00:00
Chiachang Wang
70348a2672
Update the permission check for dump
...
ServicePermissionsTest#testDumpProtected expects to see nothing
from dump() if the caller does not have the required permission.
After the refactor the ConnectivityService#dump(). It does not
leak real information for those callers without permission but
show the title of dumpsys, i.e. it shows "DUMP OF SERVICE HIGH
connectivity". This breaks the test since the test expects to
see nothing.
Move the permission check to the front of dump call stack since
there is no way to call other private dump related methods.
Bug: 185425662
Test: atest android.security.cts.ServicePermissionsTest
Test: adb shell dumpsys connectivity
Change-Id: I173c968a4f1c4d6f618ed87725a6ccda8d309988
2021-04-19 11:09:15 +08:00
Junyu Lai
a0808bbac3
Merge "[VCN20] Change requestBackgroundNetwork argument order" am: bd7b4a4a65 am: 0e6e9b34a0
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1675630
Change-Id: I2b4369cb4127f130076ced52ba020db99f617cd7
2021-04-16 16:52:07 +00:00
Junyu Lai
0e6e9b34a0
Merge "[VCN20] Change requestBackgroundNetwork argument order" am: bd7b4a4a65
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1675630
Change-Id: I73df5528088176070af6e54e01358b1edec27b50
2021-04-16 16:25:55 +00:00
Junyu Lai
bd7b4a4a65
Merge "[VCN20] Change requestBackgroundNetwork argument order"
2021-04-16 16:04:31 +00:00
Lorenzo Colitti
0b8438b700
Merge "Don't expose raw IBinder APIs." am: 6e535a1294 am: 5bc05685a3
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1676436
Change-Id: I42ef2c83eefc6dc4967e71be82f48cca38d74f43
2021-04-16 08:13:03 +00:00
Aaron Huang
57a82edf0b
Merge "Handle null pointer cases in ConnectivityService" am: 7b38530eac am: 0f2b3c67e7
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1669646
Change-Id: I2821348230f093569e8149779a88d31ce2b0b322
2021-04-16 08:12:18 +00:00
Lorenzo Colitti
5bc05685a3
Merge "Don't expose raw IBinder APIs." am: 6e535a1294
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1676436
Change-Id: Ic954df4bcbb444797d62077047cd74182ac06164
2021-04-16 07:42:57 +00:00
Aaron Huang
0f2b3c67e7
Merge "Handle null pointer cases in ConnectivityService" am: 7b38530eac
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1669646
Change-Id: I30a02b57b58cbd3197faa614d036daec7ff06bd6
2021-04-16 07:29:00 +00:00
Lorenzo Colitti
6e535a1294
Merge "Don't expose raw IBinder APIs."
2021-04-16 07:22:13 +00:00
Aaron Huang
7b38530eac
Merge "Handle null pointer cases in ConnectivityService"
2021-04-16 07:06:37 +00:00
junyulai
e576c085c3
[VCN20] Change requestBackgroundNetwork argument order
...
Test: atest FrameworksNetTests FrameworksVcnTests
Fix: 185215095
Merged-In: Id281678fe85ce0894b0e92e11c0283d4d1b4ecdb
Change-Id: Id281678fe85ce0894b0e92e11c0283d4d1b4ecdb
(cherry-picked from ag/14198667)
2021-04-16 00:16:21 +08:00
Aaron Huang
6a16a415d9
Handle null pointer cases in ConnectivityService
...
If a method is called by adb command "service call"
with no parameters. It will cause to crash because
of a null object reference.
Add a null check for them to avoid system server crash.
Bug: 172885426
Test: FrameworksNetTest
adb shell service call connectivity #
Change-Id: I8748fc5c6a7a6e82db3581e3026a3f75909a357e
2021-04-16 00:15:25 +08:00
Chiachang Wang
965b73b955
Merge "Remove hidden method link in public addRoute API" am: 7e1afe7650 am: d9f6d6e397
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1676435
Change-Id: I3477f3a78ebee26d950ce6c6eaf45cdef8a5ee6d
2021-04-15 12:46:41 +00:00
Chiachang Wang
d9f6d6e397
Merge "Remove hidden method link in public addRoute API" am: 7e1afe7650
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1676435
Change-Id: Ide004783057673561ea631e0a59ce4c01c2841af
2021-04-15 11:53:02 +00:00
Chiachang Wang
7e1afe7650
Merge "Remove hidden method link in public addRoute API"
2021-04-15 11:26:41 +00:00
Treehugger Robot
dc05bc9aa7
Merge "Add test for [set|is]BypassableVpn" am: 3fbec7cf77 am: 7f7769b82e
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1676426
Change-Id: I03024cb93ea05cccb7ec43a19c3430ef20637eeb
2021-04-15 10:54:23 +00:00
Treehugger Robot
7f7769b82e
Merge "Add test for [set|is]BypassableVpn" am: 3fbec7cf77
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1676426
Change-Id: Ia433edec97f3a02c95dcf89f9f8ae80244063a89
2021-04-15 10:01:20 +00:00
Lorenzo Colitti
b35d038d99
Don't expose raw IBinder APIs.
...
APIs should not expose raw IBinder objects.
Fix: 184735751
Test: builds, boots
Test: atest CtsNetTestCases:android.net.cts.ConnectivityManagerTest
Test: atest CtsNetTestCases:android.net.cts.DnsResolverTest
Change-Id: Ia0c4170def31123f0b79318fec2cfe02e4fcd3bf
2021-04-15 18:47:21 +09:00
Chiachang Wang
9ebe6cfeb3
Remove hidden method link in public addRoute API
...
The build will complain after moving connectivity framework code
outside framework because the hidden methods/members accesses are
not allowed anymore. Link to a hidden class will not work since
it's not visible in public.
Bug: 182859030
Test: make docs
Change-Id: I5726f80be7cf92b648ce851d9601d5f58bc2b647
2021-04-15 16:21:00 +08:00
lucaslin
df2a314d6c
Add test for [set|is]BypassableVpn
...
Bug: 182963397
Test: 1. atest CtsNetTestCases:NetworkAgentConfigTest
2. atest CtsNetTestCasesLatestSdk:NetworkAgentConfigTest
Change-Id: I0250a0313d3a7561ab8efa851fbc06f5bce11185
2021-04-15 15:44:01 +08:00
Remi NGUYEN VAN
98bab00fc9
Add a test for ParseException
...
The test simply creates an exception and verifies that it has the
required fields.
Test: atest FrameworksNetTests
Change-Id: I76ded2ac3f93ff3910bba3f1e4f1c17092e35372
2021-04-14 09:37:30 +00:00
Bill Yi
3b8115928b
[automerger skipped] Merge "Merge RQ2A.210405.006 to aosp-master - DO NOT MERGE" am: 24c6eaea15 -s ours am: 7771a62ab1 -s ours
...
am skip reason: skip tag Change-Id I735b41ed53ce7d374b5d36c4aee79f73d0334234 with SHA-1 bf7c109ed6 is already in history
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1674888
Change-Id: Ie4dfff3cfbe5df4b60353217e8f99611438fd2be
2021-04-14 06:31:20 +00:00
Bill Yi
7771a62ab1
[automerger skipped] Merge "Merge RQ2A.210405.006 to aosp-master - DO NOT MERGE" am: 24c6eaea15 -s ours
...
am skip reason: skip tag Change-Id I735b41ed53ce7d374b5d36c4aee79f73d0334234 with SHA-1 bf7c109ed6 is already in history
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1674888
Change-Id: I92a667574c0f8f8754c6c1c28d90c32f26e8d3b3
2021-04-14 05:46:16 +00:00
Bill Yi
24c6eaea15
Merge "Merge RQ2A.210405.006 to aosp-master - DO NOT MERGE"
2021-04-14 04:59:51 +00:00
Bill Yi
51f05deb78
Merge RQ2A.210405.006 to aosp-master - DO NOT MERGE
...
Merged-In: I735b41ed53ce7d374b5d36c4aee79f73d0334234
Merged-In: I9999bfe514fffa9f300643e74942db5ae556670a
Change-Id: If4b670a158e561d8feb03e12aef2d295c5109d43
2021-04-13 19:36:45 -07:00
Lorenzo Colitti
d76eb01fbe
Merge "Add @RedactionType annotations to VpnTransportInfo." am: 97b4639efa am: c6a866fb42
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1674568
Change-Id: I3c13a27c78cb824d366095edbf37d30527978def
2021-04-14 02:33:11 +00:00
Lorenzo Colitti
c6a866fb42
Merge "Add @RedactionType annotations to VpnTransportInfo." am: 97b4639efa
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1674568
Change-Id: I4febfa2d96c678decff23eb08e40ba0e33e4c7bf
2021-04-14 01:24:19 +00:00
Bill Yi
7d7b5bcb9f
[automerger skipped] Merge RQ2A.210405.006 to stage-aosp-master - DO NOT MERGE am: 32cf6f6f6b -s ours
...
am skip reason: skip tag Change-Id I9af489ae7bdd448c552c97d4478f1760a13fb970 with SHA-1 4aed3924ff is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14176451
Change-Id: I9999bfe514fffa9f300643e74942db5ae556670a
2021-04-14 00:31:09 +00:00
Bill Yi
32cf6f6f6b
Merge RQ2A.210405.006 to stage-aosp-master - DO NOT MERGE
...
Merged-In: I9af489ae7bdd448c552c97d4478f1760a13fb970
Change-Id: I368382a9924b2d3dc697ae6450239f23d5cbf520
2021-04-13 15:34:44 -07:00
Lorenzo Colitti
1479494fd5
Add @RedactionType annotations to VpnTransportInfo.
...
This is in response to API council feedback.
Test: m
Bug: 185226718
Change-Id: I63d7249e7d14ac00558f311a3583f6adbf80e3d9
2021-04-14 00:28:19 +09:00
Chiachang Wang
7ebbfc98d2
Merge "Make getUid a method on UserHandle itself instead of static" am: 4bc8b1386f am: 84c2646d26
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1669185
Change-Id: Icc006ab751a1a03aa3c09c1999a6141ff061081d
2021-04-13 11:54:57 +00:00
Chiachang Wang
84c2646d26
Merge "Make getUid a method on UserHandle itself instead of static" am: 4bc8b1386f
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1669185
Change-Id: If47dccc346aa78c7cb49aafbd5e07d35d3403c6a
2021-04-13 08:51:12 +00:00
Chiachang Wang
4bc8b1386f
Merge "Make getUid a method on UserHandle itself instead of static"
2021-04-13 08:15:47 +00:00