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

563182 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Danny Epstein
3cbb779954 Merge "DO NOT MERGE Focus clock by default" into rvc-qpr-dev am: d77d372dc7 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13223231

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I6f3e2761489f5dd954d1e490f9d8b926e4f61e13
 2021-01-13 00:33:04 +00:00
Danny Epstein
225530ba1c DO NOT MERGE Focus clock by default am: ab6fd7362d 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13223231

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I6f55b1deacdfe520bf371f48c98d1e16b675cf77
 2021-01-13 00:32:45 +00:00
Danny Epstein
d77d372dc7 Merge "DO NOT MERGE Focus clock by default" into rvc-qpr-dev 2021-01-13 00:20:19 +00:00
Tomasz Wasilczyk
dcc64b54fc Merge "Keep Vehicle internal network always up" am: c353781098 am: e189a2466a 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1535861

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ibfb77d0632352c41629395fe4d8b546c593599ce
 2021-01-12 23:04:07 +00:00
Ken Chen
3da4638c49 Merge "Let ConnectivityService control the socket closure" am: 191e2d3c39 am: fac52cd24b 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1534909

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I792005c9abd7ccf6a0948330a32b2dcc07d51506
 2021-01-12 23:03:49 +00:00
Tomasz Wasilczyk
e189a2466a Merge "Keep Vehicle internal network always up" am: c353781098 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1535861

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I486b4c9dd987dd94b4e4ca9d1f87fe58d9f9f51e
 2021-01-12 22:43:41 +00:00
Tomasz Wasilczyk
c353781098 Merge "Keep Vehicle internal network always up" 2021-01-12 22:40:50 +00:00
Ken Chen
fac52cd24b Merge "Let ConnectivityService control the socket closure" am: 191e2d3c39 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1534909

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I867128ec2eddf494c8ff15e19c54733778d5eace
 2021-01-12 22:39:07 +00:00
Ken Chen
191e2d3c39 Merge "Let ConnectivityService control the socket closure" 2021-01-12 22:23:59 +00:00
TreeHugger Robot
910b875440 Merge "Fix the ambient lux which did not update for blocking zone" into rvc-qpr-dev am: 61b61e49ed 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13288650

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ib3c67929da76d462dfb42df1bcbc406388930278
 2021-01-12 22:08:35 +00:00
TreeHugger Robot
61b61e49ed Merge "Fix the ambient lux which did not update for blocking zone" into rvc-qpr-dev 2021-01-12 21:45:48 +00:00
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
Tomasz Wasilczyk
ab315c597d Keep Vehicle internal network always up 
Bug: 171801262
Test: Boot with and without overlay set and check ifconfig
Change-Id: I1fd332caf3e09924abcfec9c2c137363be7873e4
 2021-01-12 10:33:38 -08: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
Ken Chen
b2d17e81cc Let ConnectivityService control the socket closure 
Netd currently calls maybeCloseSockets before adding/removing users for
network. The task should be moved from netd to CS. In this way, we can
handle WiFi lingering more easily in the future.

Test: atest HostsideVpnTests
Test: atest FrameworksNetTests
Change-Id: Icf8125e8552c89da367a67f48611ed193a1a343d
 2021-01-12 23:50:28 +08: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