Commit Graph

12235 Commits

Author SHA1 Message Date
Cody Kesting
d471c50620 [automerger skipped] Merge "Allow the System UID to unregister ConnDiags CBs." into rvc-qpr-dev am: 07dd48319d -s ours am: 1338b6c158 -s ours
am skip reason: Change-Id I20d0cad5f902708d366aa703c2893b0ea3e55052 with SHA-1 054451e170 is in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13169565

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I766b99d3fdba7eb7a556adf808e5041ad70a7a51
2020-12-08 20:09:37 +00:00
Cody Kesting
1338b6c158 [automerger skipped] Merge "Allow the System UID to unregister ConnDiags CBs." into rvc-qpr-dev am: 07dd48319d -s ours
am skip reason: Change-Id I20d0cad5f902708d366aa703c2893b0ea3e55052 with SHA-1 054451e170 is in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13169565

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I9cdd7edda3f94d66aa7e0bdc6daaaf5a08b360c0
2020-12-08 19:52:11 +00:00
Lorenzo Colitti
4eb55bc947 Merge "Test for the current behaviour of updating a network's owner UID." am: aafcaa9fb5 am: 62976a3a26 am: 8e44d9d778
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1512690

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ic97c893a17dcf7ce18fe31ff05828d4fe9a5e929
2020-12-08 11:02:46 +00:00
Lorenzo Colitti
8e44d9d778 Merge "Test for the current behaviour of updating a network's owner UID." am: aafcaa9fb5 am: 62976a3a26
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1512690

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I7ed6c0ba300b34e84db911cbe9554f63712e2a1c
2020-12-08 10:47:15 +00:00
Lorenzo Colitti
62976a3a26 Merge "Test for the current behaviour of updating a network's owner UID." am: aafcaa9fb5
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1512690

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I35a50be2f748177cde9400449386465d77a21556
2020-12-08 09:55:56 +00:00
Lorenzo Colitti
aafcaa9fb5 Merge "Test for the current behaviour of updating a network's owner UID." 2020-12-08 09:10:08 +00:00
Lorenzo Colitti
fadf84faf6 Merge "Add comments to the process*FromAgent methods." am: 300f6e7669 am: cba9e716fc am: 4c0f2da4ea
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1519518

Change-Id: I8de245bb78f39cd9c99d2e5f44dc1ade3c229c15
2020-12-07 21:13:40 +00:00
Lorenzo Colitti
d1bff1fafd Merge "Add a test for TcpKeepalivePacketDataParcelable.toString()." am: ee3c193706 am: 4f4ac4840d am: 964daa1a04
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1502382

Change-Id: Ib3cf8cfb3f658e119d6c725653fcfaa385766b1f
2020-12-07 21:00:25 +00:00
Ashwini Oruganti
cc1039b7c7 Merge "ConnectivityServiceTest: Mark unaudited PendingIntents with FLAG_MUTABLE_UNAUDITED" 2020-12-07 19:41:50 +00:00
Lorenzo Colitti
4c0f2da4ea Merge "Add comments to the process*FromAgent methods." am: 300f6e7669 am: cba9e716fc
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1519518

Change-Id: I9d3d9d49fe6118edc4357edc1350d1f2b89f4b2a
2020-12-07 17:34:04 +00:00
Lorenzo Colitti
cba9e716fc Merge "Add comments to the process*FromAgent methods." am: 300f6e7669
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1519518

Change-Id: Ia90b3ae008561b2ec3723770802815b46937022e
2020-12-07 17:07:08 +00:00
Lorenzo Colitti
300f6e7669 Merge "Add comments to the process*FromAgent methods." 2020-12-07 16:44:11 +00:00
Lorenzo Colitti
76a1031d33 Test for the current behaviour of updating a network's owner UID.
The current behaviour is at least bizarre and arguably incorrect.
Add a test to document the current behaviour so we can check that
any changes we make to this behaviour are correct.

Test: test-only change
Change-Id: I345bd320eced96316d92e520f576ae06b8020d9f
2020-12-08 01:40:47 +09:00
Lorenzo Colitti
3c75ca829e Add comments to the process*FromAgent methods.
Test: comment-only change
Change-Id: I5ebf6e21d79ed669f85ddf9bf466236d4bd59243
2020-12-08 01:17:17 +09:00
Lorenzo Colitti
964daa1a04 Merge "Add a test for TcpKeepalivePacketDataParcelable.toString()." am: ee3c193706 am: 4f4ac4840d
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1502382

Change-Id: Id6951382cd12dff2e4f1bd2fe47d063c8998fc2f
2020-12-07 05:18:13 +00:00
Lorenzo Colitti
4f4ac4840d Merge "Add a test for TcpKeepalivePacketDataParcelable.toString()." am: ee3c193706
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1502382

Change-Id: Ib92977574ffb28cd2e455328260f215352f24b32
2020-12-07 04:43:19 +00:00
Lorenzo Colitti
ee3c193706 Merge "Add a test for TcpKeepalivePacketDataParcelable.toString()." 2020-12-07 04:38:53 +00:00
Cody Kesting
8a1fc4cc51 Allow the System UID to unregister ConnDiags CBs.
This CL updates ConnectivityService to allow the System's UID to
unregister ConnectivityDiagnostics callbacks. Preivously, only the
registrant was allowed to unregister them - this caused problems for
callbacks that were attempted to be unregistered via binderDied() when
the registrant app dies.

Bug: 159912975
Bug: 174713659
Test: manually verified
Change-Id: I20d0cad5f902708d366aa703c2893b0ea3e55052
Merged-In: I20d0cad5f902708d366aa703c2893b0ea3e55052
(cherry picked from commit 6d675b48b2)
2020-12-04 20:46:52 +00:00
Cody Kesting
6d675b48b2 Merge "Allow the System UID to unregister ConnDiags CBs." am: 636f8cbced am: 5d0cc85448 am: 785ef9b4cd
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1515688

Change-Id: I123cfe5c1ea8d6f466bf831e87a8a11f8cf12e25
2020-12-04 19:22:05 +00:00
Cody Kesting
785ef9b4cd Merge "Allow the System UID to unregister ConnDiags CBs." am: 636f8cbced am: 5d0cc85448
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1515688

Change-Id: I5b6a900611b727ee58a5b1f2762ed10b5a24fe44
2020-12-04 18:01:04 +00:00
Cody Kesting
5d0cc85448 Merge "Allow the System UID to unregister ConnDiags CBs." am: 636f8cbced
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1515688

Change-Id: Ia82d68661c99ed5123f2a0668aec4afd5ea48cf5
2020-12-04 17:47:45 +00:00
Cody Kesting
636f8cbced Merge "Allow the System UID to unregister ConnDiags CBs." 2020-12-04 17:35:28 +00:00
Remi NGUYEN VAN
1ce3ea3908 Merge "Use IPV6_MIN_MTU from NetworkConstants in Ikev2Vpn" am: ab2944488f am: 1ebf8bfe18 am: 0249d5b5fa
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1512879

Change-Id: Id415ecdbf1509b9c2e1b3e50bb716e7368f83dfc
2020-12-04 05:14:21 +00:00
Remi NGUYEN VAN
0249d5b5fa Merge "Use IPV6_MIN_MTU from NetworkConstants in Ikev2Vpn" am: ab2944488f am: 1ebf8bfe18
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1512879

Change-Id: I516719d803ccd2b4cda91eb38ecd108babab50b8
2020-12-04 04:12:18 +00:00
Remi NGUYEN VAN
1ebf8bfe18 Merge "Use IPV6_MIN_MTU from NetworkConstants in Ikev2Vpn" am: ab2944488f
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1512879

Change-Id: I2458f7ab7ad2d65bf8c697b7a6aa40394cdc0605
2020-12-04 03:50:19 +00:00
Remi NGUYEN VAN
ab2944488f Merge "Use IPV6_MIN_MTU from NetworkConstants in Ikev2Vpn" 2020-12-04 02:05:01 +00:00
Cody Kesting
054451e170 Allow the System UID to unregister ConnDiags CBs.
This CL updates ConnectivityService to allow the System's UID to
unregister ConnectivityDiagnostics callbacks. Preivously, only the
registrant was allowed to unregister them - this caused problems for
callbacks that were attempted to be unregistered via binderDied() when
the registrant app dies.

Bug: 159912975
Bug: 174713659
Test: manually verified
Change-Id: I20d0cad5f902708d366aa703c2893b0ea3e55052
2020-12-03 17:43:50 -08:00
Patrick Rohr
bbef873e3e Merge changes from topic "restricted-networking-mode" am: 1d156cb04e am: 83711b9a0b am: 5fda0bd0af
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1505234

Change-Id: Ia175efd2e152ea4b04feddf3bdc159adca2edab5
2020-12-03 12:39:44 +00:00
Patrick Rohr
66978d1090 Clean Up NetworkManagementService Tests am: e7c4a3e7b5 am: 34d43318e1 am: 9653c209c6
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1505233

Change-Id: I24c7401ae08da82ad8e03db1b507abe50e92dd1b
2020-12-03 12:39:27 +00:00
Aaron Huang
0744dce2b9 Merge "Migrate Slog to Log used in connectivity service module" am: 78265b923a am: 6a36ac8b12 am: 2f5372d922
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1483963

Change-Id: Ifbe89bc6f2d71975f1adf7348d30d16a14c8847e
2020-12-03 12:38:57 +00:00
Patrick Rohr
5fda0bd0af Merge changes from topic "restricted-networking-mode" am: 1d156cb04e am: 83711b9a0b
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1505234

Change-Id: I1ae2656e91f1fa6b35ea34177496bd9ad23daceb
2020-12-03 11:51:32 +00:00
Patrick Rohr
9653c209c6 Clean Up NetworkManagementService Tests am: e7c4a3e7b5 am: 34d43318e1
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1505233

Change-Id: Icaee85a789737c2b10f01aa7d7a669e9f7385bd7
2020-12-03 11:51:31 +00:00
Aaron Huang
2f5372d922 Merge "Migrate Slog to Log used in connectivity service module" am: 78265b923a am: 6a36ac8b12
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1483963

Change-Id: I5ac218b548b138504d49c5f22dcf170ee0d07847
2020-12-03 11:50:59 +00:00
Patrick Rohr
83711b9a0b Merge changes from topic "restricted-networking-mode" am: 1d156cb04e
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1505234

Change-Id: I5e1d114c34e185d0b7f9bc68772431065d852dd0
2020-12-03 11:41:07 +00:00
Patrick Rohr
34d43318e1 Clean Up NetworkManagementService Tests am: e7c4a3e7b5
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1505233

Change-Id: Ia14b1784f36d54f0ba73d5841afedcf8a55a18f2
2020-12-03 11:36:15 +00:00
Aaron Huang
6a36ac8b12 Merge "Migrate Slog to Log used in connectivity service module" am: 78265b923a
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1483963

Change-Id: Ifc655142710654983dc969398f75fd84a2bc0c6e
2020-12-03 10:58:16 +00:00
Patrick Rohr
1d156cb04e Merge changes from topic "restricted-networking-mode"
* changes:
  Add Restricted Mode Firewall Chain
  Clean Up NetworkManagementService Tests
2020-12-03 10:50:25 +00:00
Aaron Huang
78265b923a Merge "Migrate Slog to Log used in connectivity service module" 2020-12-03 10:17:45 +00:00
Xin Li
1fad913736 [automerger skipped] Merge "Merge rvc-qpr-dev-plus-aosp-without-vendor@6881855" into stage-aosp-master am: 93a76f8e40 -s ours am: 8cb242af98 -s ours
am skip reason: Change-Id I78222391b83a4add8e964340ec08bb8a1306e1c6 with SHA-1 07ec9b4dcb is in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13120883

Change-Id: Ib5972f772565b2bd10e6ccee5014719037898252
2020-12-03 04:39:51 +00:00
Xin Li
8cb242af98 [automerger skipped] Merge "Merge rvc-qpr-dev-plus-aosp-without-vendor@6881855" into stage-aosp-master am: 93a76f8e40 -s ours
am skip reason: Change-Id I78222391b83a4add8e964340ec08bb8a1306e1c6 with SHA-1 07ec9b4dcb is in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13120883

Change-Id: I72cd2486ff8473dcbdef76bc855e4fe45927b943
2020-12-03 04:25:31 +00:00
Remi NGUYEN VAN
f6271f533e Merge "Do not query CS in NetworkProvider constructor" am: 6a6e5f8479 am: 0d1b3960e8 am: bcd4d930bc
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1512873

Change-Id: I194f6fed28011702dd86676e5aa422129a903d9c
2020-12-03 03:47:02 +00:00
Xin Li
93a76f8e40 Merge "Merge rvc-qpr-dev-plus-aosp-without-vendor@6881855" into stage-aosp-master 2020-12-03 03:18:49 +00:00
Remi NGUYEN VAN
bcd4d930bc Merge "Do not query CS in NetworkProvider constructor" am: 6a6e5f8479 am: 0d1b3960e8
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1512873

Change-Id: Ie9914abd1527c6478f69a0d27e64b69174badd5d
2020-12-03 02:51:19 +00:00
Remi NGUYEN VAN
0d1b3960e8 Merge "Do not query CS in NetworkProvider constructor" am: 6a6e5f8479
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1512873

Change-Id: I227076074a2d58a4b9e5e8aaa972c6338887f568
2020-12-03 02:17:16 +00:00
Remi NGUYEN VAN
6a6e5f8479 Merge "Do not query CS in NetworkProvider constructor" 2020-12-03 01:48:01 +00:00
Remi NGUYEN VAN
dffda33f86 Merge "Remove CaptivePortal deps on @hide MetricEvents" am: 465f25799c am: abbaff2736 am: 51dd9068c1
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1513141

Change-Id: Ic0f0be93d4610f47c80efb90fdd68858d70d0be8
2020-12-02 12:43:12 +00:00
Remi NGUYEN VAN
51dd9068c1 Merge "Remove CaptivePortal deps on @hide MetricEvents" am: 465f25799c am: abbaff2736
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1513141

Change-Id: I6b3b5127075289e885041ea4d09367e22fdebace
2020-12-02 12:18:03 +00:00
Remi NGUYEN VAN
abbaff2736 Merge "Remove CaptivePortal deps on @hide MetricEvents" am: 465f25799c
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1513141

Change-Id: I647b1cc3329c527d9afa507864700a521a0908be
2020-12-02 11:53:59 +00:00
Remi NGUYEN VAN
465f25799c Merge "Remove CaptivePortal deps on @hide MetricEvents" 2020-12-02 11:12:56 +00:00
Remi NGUYEN VAN
336220dce3 Merge "Add ConnectivityManager.TYPE_PROXY to SystemApi" am: 5dccc26e60 am: d38176e41a am: f073553dcf
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1512885

Change-Id: Ib51a3218d736ab905379f20fbb059bb97b2297ef
2020-12-02 10:55:57 +00:00