Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
761,321 Commits 3 Branches 0 Tags
cb106302db2f16ebdfdcad84abcbf7b46d9dbeaa
Commit Graph

23180 Commits

Author SHA1 Message Date
Sudheer Shanka
8b5ee76445 Merge "Avoid checking for idle state when the app is in top state." into tm-dev am: d2e1c51e24 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17345873

Change-Id: Ia45caffdbab92c8eb460a3d6e5dfe3e217345731
 2022-03-24 08:49:53 +00:00
Jackal Guo
54c9196fa1 Merge "Resive SliceManagerService#checkSlicePermission" 2022-03-24 00:39:04 +00:00
Sudheer Shanka
12e997720b Avoid checking for idle state when the app is in top state. 
When we know that an app moved to a procstate that is considered
an interaction event, the app will not be in idle state. So, avoid
calling into UsageStatsService for idle state in this case.

Bug: 209338078
Test: atest tests/cts/hostside/src/com/android/cts/net/HostsideRestrictBackgroundNetworkTests.java
Change-Id: I5648db595d2fd10a151da13e472fd905bcafe182
 2022-03-23 18:25:18 +00:00
Rubin Xu
094f486145 Merge "Secure REMOTE_BUGREPORT_DISPATCH" into tm-dev am: a441d81b3a 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17320104

Change-Id: I67dc59d95e36c64b6fe07b70cfdd5b0cdd4943ba
 2022-03-23 11:32:46 +00:00
Rubin Xu
a441d81b3a Merge "Secure REMOTE_BUGREPORT_DISPATCH" into tm-dev 2022-03-23 11:26:52 +00:00
Matt Pietal
a6f9ba75cc Merge "Use new DevicePolicyManager#logoutUser() methods" into tm-dev am: e7ed33a577 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17219111

Change-Id: I8c12fe63a101cfe5ff4337568732213a52a82d8a
 2022-03-22 12:48:07 +00:00
Matt Pietal
e7ed33a577 Merge "Use new DevicePolicyManager#logoutUser() methods" into tm-dev 2022-03-22 12:40:54 +00:00
Rubin Xu
a4131c50d0 Secure REMOTE_BUGREPORT_DISPATCH 
In remote bugreport collection, Shell sends REMOTE_BUGREPORT_DISPATCH to
DevicePolicyManagerService which in turn notifies Device Owners that a
bug report is ready for collection. There existed a threat where a
malicous user could spoof the REMOTE_BUGREPORT_DISPATCH broadcast via
ADB to send a crafted bugreport to the Device Owner. Securing
REMOTE_BUGREPORT_DISPATCH is not as easy as it appears: putting a
permission on REMOTE_BUGREPORT_DISPATCH does not work since both the
legitimate sender and the malicious user are UID_SHELL. Instead, we
introduces a nonce which was sent from DPMS to Shell when bugreport is
triggered, and DPM will only accept REMOTE_BUGREPORT_DISPATCH when
a matching nonce is seen.

Ignore-AOSP-First: security fix

Bug: 171495100
Test: atest DeviceOwnerTest#testRemoteBugreportWithTwoUsers
Test: atest DeviceOwnerTest#testAdminActionBookkeeping
Test: atest BugreportManagerTest
Change-Id: I7649b4f22b74647d152d76bb46d5ca70bfa3617d
 2022-03-22 12:28:36 +00:00
Pablo Gamito
b3f303944b Merge "Read custom background when creating ActivityOptions from bundle" into tm-dev am: ace23e0e89 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17071463

Change-Id: I297fe7ab03c063ab31e9032994b9cb44239a67d7
 2022-03-22 11:00:19 +00:00
Pablo Gamito
ace23e0e89 Merge "Read custom background when creating ActivityOptions from bundle" into tm-dev 2022-03-22 10:47:56 +00:00
Dave McCloskey
089538fb92 Merge "Changes to support reducing noise in active unlock notifications." into tm-dev am: c5a7ed29de 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17244181

Change-Id: Ic3a4c3707c1b874558ec3d996f6a00ba000d6dc1
 2022-03-21 19:36:57 +00:00
Dave McCloskey
c5a7ed29de Merge "Changes to support reducing noise in active unlock notifications." into tm-dev 2022-03-21 19:15:01 +00:00
TreeHugger Robot
6057c731a3 Merge "Update fields for SecurityLog WiFi events." into tm-dev am: 43d732feb3 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16993172

Change-Id: I8d0b4caa8a784b85b2ee104890045978e66b8a7c
 2022-03-21 17:47:10 +00:00
TreeHugger Robot
43d732feb3 Merge "Update fields for SecurityLog WiFi events." into tm-dev 2022-03-21 17:45:57 +00:00
Dave McCloskey
6c707a47da Changes to support reducing noise in active unlock notifications. 
1. Add additional trigger onUserMayRequestUnlock
  - point existing trigger points from SystemUI to this
2. Argument added to onUserRequestedUnlock to indicate if user wants to
   dismiss keyguard.
3. Callback for result of grantTrust calls.
  - curently only calls back if device was unlocked as a result of the
    call

See design: go/au-noise-reduction

Note: changes made to SystemUI are manually tested and may need
refactoring which is being skipped now to meet the API Freeze deadline.

Bug: 225231929
Test: atest TrustTests
Test: Manual interaction with wake & fingerprint sensor
CTS-Coverage-Bug: 213944235
Change-Id: I8d08229f09c9a1f2295b7eb464d12cad0c6b8303
 2022-03-21 09:00:43 -07:00
Charles Chen
efebcbc449 Merge "Fix #testChangeFontScaleNoRelaunch flaky" into tm-dev am: 8c1fad0d74 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17197588

Change-Id: I7b7ad4747fcae0f6c7c4b72d8146196a07500eab
 2022-03-21 09:14:18 +00:00
Charles Chen
8c1fad0d74 Merge "Fix #testChangeFontScaleNoRelaunch flaky" into tm-dev 2022-03-21 08:51:45 +00:00
Antoan Angelov
ee6b303ff5 Merge "Add DevicePolicyManager#getPolicyManagedProfiles system api" into tm-dev am: a443dccaad 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17220108

Change-Id: I02bae8657fc55e125ed34c379ed85c4a68eb85a2
 2022-03-20 20:10:10 +00:00
Antoan Angelov
a443dccaad Merge "Add DevicePolicyManager#getPolicyManagedProfiles system api" into tm-dev 2022-03-20 20:08:50 +00:00
Kholoud Mohamed
a8e9aa390d Merge changes from topic "apiFeedback" into tm-dev 
* changes:
  RESTRICT AUTOMERGE Refactor device policy resource APIs to a separate class
  RESTRICT AUTOMERGE move device policy resource APIs to a separate class
  RESTRICT AUTOMERGE hide device policy resources constants
 2022-03-19 06:30:43 +00:00
Sudheer Shanka
c7b792d093 Merge "Add ACCESS_BROADCAST_RESPONSE_STATS permission." into tm-dev am: 4b61ecc716 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17227583

Change-Id: I150ef3fcb80243b775f8e22198af2010e5d2555a
 2022-03-19 05:35:08 +00:00
Sudheer Shanka
4b61ecc716 Merge "Add ACCESS_BROADCAST_RESPONSE_STATS permission." into tm-dev 2022-03-19 05:14:21 +00:00
Nikita Ioffe
c79d536268 Merge changes from topics "presubmit-am-1dec1aa04236490e8d2a03998a4272b7", "sdk-sandbox-instr" into tm-dev am: 3b5de448c2 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17220107

Change-Id: I9b6ac48f1fdfb08305f4afcf2ef8bceb164eef0d
 2022-03-19 02:26:26 +00:00
Nikita Ioffe
3b5de448c2 Merge changes from topics "presubmit-am-1dec1aa04236490e8d2a03998a4272b7", "sdk-sandbox-instr" into tm-dev 
* changes:
  Add a way to instrument sdk sandbox processes
  Sdk Sandbox should be able to see it's client app
 2022-03-19 02:09:15 +00:00
Stefan Andonian
a6a4337382 Add an event type constant for Undismiss events when the user clicks am: 71ad90ca9f 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17206688

Change-Id: I163463256c6ae2e905f85b5bba8cacbbe9d22d76
 2022-03-19 00:24:51 +00:00
kholoud mohamed
b7aedc6f3d RESTRICT AUTOMERGE Refactor device policy resource APIs to a separate class 
Bug: 217388602
Bug: 218875965
Test: atest EnterpriseResourcesTests
Test: manual
Change-Id: I8af03136e67057d171e97cb5a43187aa6c7f4fe7
 2022-03-19 00:22:17 +00:00
kholoud mohamed
7cb1133b16 RESTRICT AUTOMERGE move device policy resource APIs to a separate class 
Bug: 217388602
Test: atest EnterpriseResourcesTests
Change-Id: I83b399f36dfe3ba93d625807659dee59d872097e
 2022-03-19 00:22:04 +00:00
Pablo Gamito
c80084d62d Merge "Add API to allow apps to update their background color programatically" into tm-dev am: a30daca9ff 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17071569

Change-Id: I6423ca093244b57a40c1d74e2a478b2958724354
 2022-03-19 00:21:40 +00:00
Beth Thibodeau
e6a428b452 Merge "Revert^2 "Use compat framework to gate session actions"" into tm-dev am: 77472b3e78 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17222204

Change-Id: I1c5b156ee15194b22fd638479419570aaf0674d4
 2022-03-19 00:02:43 +00:00
Stefan Andonian
71ad90ca9f Add an event type constant for Undismiss events when the user clicks 
Undo after dragging a predicted app icon onto the "Do Not Suggest" drop
target.

Bug: b/200841778
Test: Verified that the constant was usable from Launcher project.
Change-Id: I0f7e4f139a7b9012fd55bf72294dd8c1fab38a39
 2022-03-18 22:15:09 +00:00
Pablo Gamito
a30daca9ff Merge "Add API to allow apps to update their background color programatically" into tm-dev 2022-03-18 21:41:03 +00:00
kholoud mohamed
6ed9faf5bd RESTRICT AUTOMERGE hide device policy resources constants 
Bug: 218875965
Bug: 217388602
Test: atest EnterpriseResourcesTests
Change-Id: Iac71c0d5b451e8ec77c0ca0113e2248ef21cc412
 2022-03-18 20:47:12 +00:00
Beth Thibodeau
77472b3e78 Merge "Revert^2 "Use compat framework to gate session actions"" into tm-dev 2022-03-18 19:56:38 +00:00
Jonathan Scott
09b4163ac5 Merge "Add setProfileOwnerOnOrganizationOwnedDevice COPE API." into tm-dev am: 9bc9a8bdd1 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17255325

Change-Id: Ie369e4ac63b744ab5645219d29df778f20bd960a
 2022-03-18 18:02:31 +00:00
Sudheer Shanka
c59fa6240c Merge "Add a hidden API to query appstandby constants." into tm-dev am: 0de55a3459 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17129613

Change-Id: I4b17f5280236b69714627ea52dcf9096bb1697a3
 2022-03-18 17:59:15 +00:00
Jonathan Scott
9bc9a8bdd1 Merge "Add setProfileOwnerOnOrganizationOwnedDevice COPE API." into tm-dev 2022-03-18 17:50:42 +00:00
Sudheer Shanka
0de55a3459 Merge "Add a hidden API to query appstandby constants." into tm-dev 2022-03-18 17:43:26 +00:00
arangelov
69bb632cb8 Add DevicePolicyManager#getPolicyManagedProfiles system api 
That way the logic to get a managed profile can be
customizable by OEMs.

Fixes: 214473624
Test: manual
Test: CTS tests to be added in a follow-up CL
Change-Id: Id183e987d2cb04040db028b9913188267d1a9a84
 2022-03-18 17:11:26 +00:00
TreeHugger Robot
98864c697a Merge changes from topics "presubmit-am-859dd3744ae243f9a8cb2f6234a9ef1e", "register_api" into tm-dev am: 1b58550351 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17182885

Change-Id: I4807ab3b2b84b866535ca919486e555b7dfc27ff
 2022-03-18 17:11:23 +00:00
TreeHugger Robot
1b58550351 Merge changes from topics "presubmit-am-859dd3744ae243f9a8cb2f6234a9ef1e", "register_api" into tm-dev 
* changes:
  Change parameter order to make it SAM compatible
  Fix a problem that Dialog does not close in new dispatch.
 2022-03-18 17:04:05 +00:00
Kholoud Mohamed
3d31e0b93b Merge changes from topic "resetAPIs" into tm-dev 
* changes:
  RESTRICT AUTOMERGE add requiresAPI annotation for DPM#getString
  RESTRICT AUTOMERGE Expose getString APIs as public
 2022-03-18 16:07:22 +00:00
Jonathan Scott
9b8cfbb61c Merge "Add finalizeWorkProfileProvisioning." into tm-dev am: 95826d61fb 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17226323

Change-Id: If56a31150b87696e84f4eaaa61a1699633ad1ad9
 2022-03-18 14:52:39 +00:00
Pratyush More
236e4b85a9 Merge "Move LocaleManagerTests to postsubmit suite." into tm-dev am: 7da1954f69 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17237985

Change-Id: I8106ff517fef27dcff2fad6cb341167940eb69de
 2022-03-18 14:51:44 +00:00
Nikita Ioffe
99ba880e55 Add a way to instrument sdk sandbox processes 
The following restrictions applies to the instrumentation of the sdk
sandbox processes:

* Instrumentation must be signed with the same certificate as the client
  app the instrumented sdk sandbox belongs to.
* If there is a running instance of to-be-instrumented sdk sandbox
  process, then it will be killed before the instrumentation starts.
* While instrumentation is running the client app won't be allowed to
  connect to the instrumented sdk sandbox process.
* The --no-restart instrumentation of the sdk sandbox processes is not
  supported.

Bug: 209061624
Test: atest SdkSandboxInprocessTests
Change-Id: Ia4b145c091bf8da600a77ea82fc9e3cd97757275
 2022-03-18 14:50:21 +00:00
Jonathan Scott
95826d61fb Merge "Add finalizeWorkProfileProvisioning." into tm-dev 2022-03-18 14:50:07 +00:00
Pratyush More
7da1954f69 Merge "Move LocaleManagerTests to postsubmit suite." into tm-dev 2022-03-18 14:48:43 +00:00
Antoan Angelov
1922c4a575 Merge "Add extra to inform the role holder of the update attempt result" into tm-dev am: b7b3316789 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17220027

Change-Id: I7dbe1b5241cb63125247d59bd6959d59ced7c78f
 2022-03-18 14:40:41 +00:00
Antoan Angelov
b7b3316789 Merge "Add extra to inform the role holder of the update attempt result" into tm-dev 2022-03-18 14:29:48 +00:00
Antoan Angelov
29c0f1e6c0 Merge "Make config_devicePolicyManagementUpdater readable by tests" into tm-dev am: 8c241a637e 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17044813

Change-Id: I838e25b7f33919ac7ce25d91b8973da6fae23bb1
 2022-03-18 13:08:39 +00:00
Antoan Angelov
587aebd33a Merge "Update javadoc for EXTRA_PROVISIONING_ROLE_HOLDER_CUSTOM_USER_CONSENT_INTENT" into tm-dev am: efdd8dba93 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17156428

Change-Id: I92dda57f07a61b9be8dc0e69b33ffc9f21acddda
 2022-03-18 13:07:50 +00:00