Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
563,167 Commits 3 Branches 0 Tags
7c6dd474c4c14b9366e2ca7dce15b5d0fbbb2d88
Commit Graph

563167 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Treehugger Robot
7c6dd474c4 Merge "Reland revert of "Added mitigation for b/122921367"""" am: 5be93c2823 am: 333c5f633f 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1546309

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Id9cbc5ee29e82a28d1a26d6d14e5c342c6d65136
 2021-01-12 21:03:02 +00:00
Adam Bookatz
9ac98ffa59 Merge "Add User* OWNERS file (part 2)" am: da79da08f0 am: b9b73d26db 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1543926

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I87bc14c52e4aa4ed42f73496e104f0f3182c613b
 2021-01-12 20:55:13 +00:00
Treehugger Robot
333c5f633f Merge "Reland revert of "Added mitigation for b/122921367"""" am: 5be93c2823 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1546309

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I427fc5166b5d5e29340a549f42626e1ac062d80f
 2021-01-12 20:51:56 +00:00
Patrick Rohr
da388b2cb4 Merge changes from topic "restricted-mode-cts" am: a96eeac8d6 am: 6b0836f428 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1545868

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I8b20d406cc52bf79b3644be76505cae1c285736a
 2021-01-12 20:48:25 +00:00
Patrick Rohr
429f94a923 Add shell command to query Restricted Mode state am: ce9f94d956 am: 791ea8a405 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1545867

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ica34e35563ce181894c865ba94eafa8ce097fe6f
 2021-01-12 20:48:23 +00:00
Patrick Rohr
d5475db15a Add Restricted Mode settings observer to NetworkPolicyManagerService am: 8b6082b585 am: f2832ba483 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1545866

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I2e00cf86a40356d373e56375eec78679cd06b191
 2021-01-12 20:48:21 +00:00
Patrick Rohr
c4ad204556 Merge changes I0731fa84,Id31a60ad am: 1ab1849ab2 am: 6e05084c6a 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1545865

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I081abc916ae5ec6333cfda1d8a6e5ee20560be85
 2021-01-12 20:47:46 +00:00
Adam Bookatz
b9b73d26db Merge "Add User* OWNERS file (part 2)" am: da79da08f0 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1543926

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I06b98717800242d82eb60c7e7144d1a53c0cfefd
 2021-01-12 20:47:44 +00:00
Patrick Rohr
ad3194204d Refactor updating rules for all apps in NetworkPolicyManagerService am: e944af5bd6 am: 9405e43734 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1545864

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Iee0b722916a5b48bb2b375f8d7e0f39620936617
 2021-01-12 20:47:43 +00:00
Patrick Rohr
6b0836f428 Merge changes from topic "restricted-mode-cts" am: a96eeac8d6 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1545868

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I4015fa686b9511bfb89e4b6e3093def02d3eb9b1
 2021-01-12 20:43:06 +00:00
Patrick Rohr
791ea8a405 Add shell command to query Restricted Mode state am: ce9f94d956 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1545867

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: If8f0ebad3b3aa8d0552f75b2927607e616970a0d
 2021-01-12 20:39:28 +00:00
Patrick Rohr
f2832ba483 Add Restricted Mode settings observer to NetworkPolicyManagerService am: 8b6082b585 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1545866

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I8c42c4c0ac3dcf860d5daacaf2748ea951a9cade
 2021-01-12 20:34:21 +00:00
Treehugger Robot
5be93c2823 Merge "Reland revert of "Added mitigation for b/122921367"""" 2021-01-12 20:32:17 +00:00
Patrick Rohr
6e05084c6a Merge changes I0731fa84,Id31a60ad am: 1ab1849ab2 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1545865

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Idb217a2f933bd215a489f202f737122cf87b9b36
 2021-01-12 20:28:07 +00:00
Patrick Rohr
9405e43734 Refactor updating rules for all apps in NetworkPolicyManagerService am: e944af5bd6 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1545864

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ib1bf72d746a418d7310eb59a8039221fd56988c2
 2021-01-12 20:14:27 +00:00
Evan Laird
4134ac8ade Merge "Listen for EXTRA_PRESENT changes" into rvc-qpr-dev am: 623049adac 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13083016

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Iad025254e0c1d8e3400ee9554594bc28d5b20b84
 2021-01-12 20:12:54 +00:00
Evan Laird
623049adac Merge "Listen for EXTRA_PRESENT changes" into rvc-qpr-dev 2021-01-12 18:57:58 +00:00
Adam Bookatz
da79da08f0 Merge "Add User* OWNERS file (part 2)" 2021-01-12 18:46:24 +00:00
Patrick Rohr
a96eeac8d6 Merge changes from topic "restricted-mode-cts" 
* changes:
  Prevent clearing Restricted Mode uid state when other rules change
  Add shell command to query Restricted Mode state
  Add Restricted Mode settings observer to NetworkPolicyManagerService
 2021-01-12 17:41:19 +00:00
Patrick Rohr
8591180dc5 Prevent clearing Restricted Mode uid state when other rules change 
Bug: 157505406
Test: atest NetworkPolicyManagerServiceTest &&
      atest com.android.cts.net.HostsideRestrictBackgroundNetworkTests
Change-Id: I3437d222116a0860c8192d30b185560a73c043a7
 2021-01-12 17:41:08 +00:00
Patrick Rohr
ce9f94d956 Add shell command to query Restricted Mode state 
This will be used in the CTS test to query the state of the Restricted
Mode.

Test: adb shell cmd netpolicy get restricted-mode
Bug: 170323671
Bug: 175281879
Change-Id: Ic25b5835d48a4b54eb9f2b4817244651ea09bd60
 2021-01-12 17:40:59 +00:00
Patrick Rohr
8b6082b585 Add Restricted Mode settings observer to NetworkPolicyManagerService 
This allows to enable / disable restricted mode at runtime.

Test: adb shell settings put global restricted_networking_mode 1
Bug: 170322816
Bug: 157505406
Change-Id: Ie9456f6a0b8d6d4e8e4bdfc3f6954e247fd9c5fb
Merged-In: Ie9456f6a0b8d6d4e8e4bdfc3f6954e247fd9c5fb
 2021-01-12 17:40:46 +00:00
Patrick Rohr
1ab1849ab2 Merge changes I0731fa84,Id31a60ad 
* changes:
  Add Restricted Mode handling to NetworkPolicyManager
  Refactor updating rules for all apps in NetworkPolicyManagerService
 2021-01-12 17:40:24 +00:00
Benjamin Franz
9f7867cee2 Merge "Add new overridable annotation to platform compat" am: 458515e464 am: 899cd8920b 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1540124

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ie8c48feb66285ec4153d61eb83ff8967dae28adf
 2021-01-12 16:41:53 +00:00
Benjamin Franz
899cd8920b Merge "Add new overridable annotation to platform compat" am: 458515e464 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1540124

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Icdb84460fab8ec12e185a6f78afa0efd8de2d3b5
 2021-01-12 16:22:18 +00:00
Dave Mankoff
23dbba641c Merge "Pass interaction type to FalsingManager.isFalse" into rvc-qpr-dev am: 37bba85895 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13317667

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I3404cfdb3f3411d88d49cbfcd8eaa9455a620eb8
 2021-01-12 16:22:09 +00:00
Dave Mankoff
37bba85895 Merge "Pass interaction type to FalsingManager.isFalse" into rvc-qpr-dev 2021-01-12 15:54:09 +00:00
Benjamin Franz
458515e464 Merge "Add new overridable annotation to platform compat" 2021-01-12 15:38:01 +00:00
Patrick Rohr
048bc5ea80 Add Restricted Mode handling to NetworkPolicyManager 
Adds Restricted Mode functionality to NetworkPolicyManager. When this
mode is turned on (via setting), only apps with
android.permission.CONNECTIVITY_USE_RESTRICTED_NETWORKS will be able to
use the network. For all other apps, the network will be blocked by the
firewall. This is controlled by a new allowlist firewall chain
fw_restricted_mode.

As a first step, this implementation still requires a reboot after the
enabling / disabling the mode to take effect. I will provide the dynamic
configuration in the next CL.

Test: atest CtsHostsideNetworkTests && atest
NetworkPolicyManagerServiceTest
Bug: 170322816
Bug: 157505406
Bug: 170322455
Bug: 175281879

Exempt-From-Owner-Approval: Change already merged on internal gerrit.
Change-Id: I0731fa842c69683953baaf9ec3a9a03454f4c607
Merged-In: I0731fa842c69683953baaf9ec3a9a03454f4c607
 2021-01-12 11:59:17 +00:00
Lorenzo Colitti
316966eb7e Merge "Remove Vpn#isBlockingUid." am: 2982364969 am: 88f04b79bd 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1528212

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ic509770103b1538cdb5a16e8ba0753029c0863b9
 2021-01-12 11:12:11 +00:00
Paul Hu
9425733cd6 Merge "Replace NetworkPolicyManagerInternal#isUidNetworkingBlocked()" am: 158e8ae1f1 am: 42a2d40519 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1535722

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I623a01c29978908b213e888ffebc06f38d5ee085
 2021-01-12 11:11:08 +00:00
Lorenzo Colitti
88f04b79bd Merge "Remove Vpn#isBlockingUid." am: 2982364969 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1528212

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I2c3745aaf5822a75e4597d7ff326680f9d7c63d7
 2021-01-12 10:25:46 +00:00
Paul Hu
42a2d40519 Merge "Replace NetworkPolicyManagerInternal#isUidNetworkingBlocked()" am: 158e8ae1f1 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1535722

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Id0936169def9a3ec1fe5895f948fc2a776a0deec
 2021-01-12 10:22:27 +00:00
Lorenzo Colitti
2982364969 Merge "Remove Vpn#isBlockingUid." 2021-01-12 10:20:33 +00:00
Treehugger Robot
3854c7ac43 Merge "[VCN02] Make LingerTimer takes request Id instead of NetworkRequest" am: 46c82c2739 am: ce706fe852 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1529109

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I1388064603ed3df9719997522e53ffb7b4903b25
 2021-01-12 10:05:35 +00:00
Paul Hu
158e8ae1f1 Merge "Replace NetworkPolicyManagerInternal#isUidNetworkingBlocked()" 2021-01-12 09:53:05 +00:00
Treehugger Robot
ce706fe852 Merge "[VCN02] Make LingerTimer takes request Id instead of NetworkRequest" am: 46c82c2739 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1529109

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I01c9c7e2b8022f2fbec610934e43245cda3483be
 2021-01-12 09:40:36 +00:00
Treehugger Robot
46c82c2739 Merge "[VCN02] Make LingerTimer takes request Id instead of NetworkRequest" 2021-01-12 08:59:04 +00:00
Patrick Rohr
e944af5bd6 Refactor updating rules for all apps in NetworkPolicyManagerService 
This gives more flexibility to the user (e.g. will allow restricted
networking mode to update all firewall rules at once) and removes some
unnecessary code.

Bug: 170322816
Bug: 157505406
Test: atest NeworkPolicyManagerServiceTest
Change-Id: Id31a60ad37c280bfb4f5bacf63aafe9de28c5e62
Merged-In: Id31a60ad37c280bfb4f5bacf63aafe9de28c5e62
 2021-01-12 09:25:06 +01:00
Treehugger Robot
795ef23ed8 Merge "Improve error message when testing network factory" am: e8cd6e4fef am: 324e0f161a 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1531798

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I1b867dec65d458d248706b4118f8d23055eea3a8
 2021-01-12 05:13:18 +00:00
Treehugger Robot
324e0f161a Merge "Improve error message when testing network factory" am: e8cd6e4fef 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1531798

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I80d0f3bd9ef8c9da1d311b001d2c42a5d1652e08
 2021-01-12 04:18:22 +00:00
TreeHugger Robot
da4cb98b05 Merge "Fix renaming file and moving file issue in MTP" into rvc-qpr-dev am: d099321312 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13090503

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ibdb009f96a2e55bb29dd7189451a7cbf57d6919a
 2021-01-12 04:18:20 +00:00
TreeHugger Robot
d099321312 Merge "Fix renaming file and moving file issue in MTP" into rvc-qpr-dev 2021-01-12 03:55:52 +00:00
Treehugger Robot
e8cd6e4fef Merge "Improve error message when testing network factory" 2021-01-12 03:50:30 +00:00
paulhu
cb693f8e2c Replace NetworkPolicyManagerInternal#isUidNetworkingBlocked() 
Connectivity service is going to become a mainline module which
will not able to access hidden APIs. NetworkPolicyManagerInternal
is a internal serivce that CS can't be access after be a mainline
module. Thus, replace NPMI#isUidNetworkingBlocked() to similar
method NPMS#isUidNetworkingBlocked() and create new API
NPM#isUidNetworkingBlocked() to support CS usage.

Bug: 170598012
Test: atest FrameworksNetTests
Test: atest FrameworksCoreTests:NetworkPolicyManagerTest
Test: atest FrameworksServicesTests:NetworkPolicyManagerServiceTest
Test: atest CtsNetTestCases
Test: atest CtsHostsideNetworkTests
Change-Id: Ic3427c71c395de787320f303c9513874b4d64f98
 2021-01-12 10:53:05 +08:00
Remi NGUYEN VAN
ce98a47a89 Merge "Revert^2 "Move service-connectivity to the tethering APEX"" am: 2f0fafeb11 am: f931a80e81 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1542626

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I0b44d8e25e3f0a4d596cef2befea52c2606c9a58
 2021-01-12 02:21:57 +00:00
Remi NGUYEN VAN
0bf2dfbefc Merge "Revert^2 "Set setCurrentProxyScriptUrl as public"" am: 5aec9c87e4 am: aab03fb10c 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1542625

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I444f0f93b395be595e58b1766e4f94f1a046bf2d
 2021-01-12 02:21:40 +00:00
Adam Bookatz
8c9499011f Merge "Add User* OWNERS file (part 1)" am: d8782e1a11 am: 22d9f95a9a 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1546301

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Icb3eca04c962b978d4afa70960eaa5b4b17eb2f7
 2021-01-12 02:21:19 +00:00
Remi NGUYEN VAN
f931a80e81 Merge "Revert^2 "Move service-connectivity to the tethering APEX"" am: 2f0fafeb11 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1542626

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I5dc50e0510e1716db733fec6fa56adfe91ac4cc0
 2021-01-12 02:05:59 +00:00
Remi NGUYEN VAN
aab03fb10c Merge "Revert^2 "Set setCurrentProxyScriptUrl as public"" am: 5aec9c87e4 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1542625

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I97d232b365e868b1533d0600778f7dbb823a4d2a
 2021-01-12 02:01:42 +00:00