Commit Graph

23091 Commits

Author SHA1 Message Date
Sharon Su
affee4a5e1 Merge "Update WallpaperEffectsGeneration api, including annotations on data classes and allow the same uid process to call returnCinematicResponse API." into tm-dev 2022-03-25 17:05:09 +00:00
Mark Renouf
fe4b81853e Merge "Remove permission token from startActivityAsCaller" into tm-dev 2022-03-25 02:32:08 +00:00
Sharon Su
bb146eff49 Update WallpaperEffectsGeneration api, including annotations on data classes and allow the same uid process to call returnCinematicResponse API.
Test: Manual test on device
Bug: 218570612
Change-Id: Ie12b570f1e6400ab9e289b882e5821921a609e0a
(cherry picked from commit 1611a8d1c5)
Merged-In: Ie12b570f1e6400ab9e289b882e5821921a609e0a
2022-03-24 23:08:08 +00:00
Antonio Kantek
f9cb8fa27b Merge "Update setInTouchMode javadoc" into tm-dev 2022-03-24 21:07:40 +00:00
Alex Johnston
c7df8de886 Merge "Require TRIGGER_LOST_MODE permission for sendLostModeLocationUpdate" into tm-dev 2022-03-24 17:20:56 +00:00
Hui Yu
63258db33d Merge "[Bugfix] Don't delete mPendingUids if PendingTopPid is added later than updateOomAdj started" am: 8f321a616b am: c9c23976a9 am: a0be2d5cc5
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2036403

Change-Id: I278a9e0c7cf4f42431a40c054738873888bf033f
2022-03-24 17:17:09 +00:00
Hui Yu
a0be2d5cc5 Merge "[Bugfix] Don't delete mPendingUids if PendingTopPid is added later than updateOomAdj started" am: 8f321a616b am: c9c23976a9
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2036403

Change-Id: Ie87188285f12c8d533ce053c1626a8080e04b67c
2022-03-24 16:46:13 +00:00
TreeHugger Robot
e61854471e Merge "RESTRICT AUTOMERGE Rename PermissionController resource constants" into tm-dev 2022-03-24 16:05:32 +00:00
Hui Yu
5e90a571ce Merge "Increase startForeground() timeout to 30 seconds." into tm-dev 2022-03-24 15:42:37 +00:00
Riddle Hsu
5ff11183cc Merge "Drop task snapshot with invalid hw buffer" into tm-dev 2022-03-24 14:23:49 +00:00
Issei Suzuki
215a637b6c Merge "Add ActivityOption to remove insecure keyguard when activity is launched." into tm-dev 2022-03-24 13:42:34 +00:00
Alex Johnston
f7a1a20815 Require TRIGGER_LOST_MODE permission for sendLostModeLocationUpdate
Changes:
* Use TRIGGER_LOST_MODE permission to gate the
  DevicePolicyManager API sendLostModeLocationUpdate

Bug: 223148704
Test: atest android.devicepolicy.cts.LostModeLocationTest
Change-Id: If15388a377c75b7581c9c2a35b3d9828f78e13fc
Merged-In: If15388a377c75b7581c9c2a35b3d9828f78e13fc
2022-03-24 12:29:28 +00:00
Riddle Hsu
5df3f27df3 Drop task snapshot with invalid hw buffer
The notifyTaskSnapshotChanged may not be always called after
Binder.clearCallingIdentity. And because there was commit
67b0902 that avoids keeping unnecessary buffer in remote
processes, it may mis-close the buffer in system server if
the calling pid isn't cleared on binder thread.

e.g. there are several suspects from ActivityTaskManagerInternal
Though it might be the responsibility of the caller to clear
binder identity before calling internal interfaces.

Instead of adding clearCallingIdentity every where:
1. Explicitly set the listener as local to skip closing the buffer
   so it is independent of which thread is calling.
2. Protect the persister when using the buffer.

Bug: 192143094
Bug: 220659717
Bug: 223950159
Bug: 225794452
Test: atest TaskSnapshotPersisterLoaderTest
Change-Id: I94e8e706e56a73fffe8189023bcef5efd797a24c
2022-03-24 08:44:31 +00:00
Antonio Kantek
afb41741b9 Update setInTouchMode javadoc
Update the javadoc for Instrumentation#setInTouchMode indicating that
starting from Android Tiramisu, this method will only take effect if the
instrumentation was sourced from SHELL or ROOT owned processes.

Test: m
Fixes: 222652344
Change-Id: I8af79acb11f17233f395412670c9f171aec80c59
2022-03-23 21:34:28 -07:00
huang chaopeng
2da542d368 [Bugfix] Don't delete mPendingUids if PendingTopPid is added later than updateOomAdj started
Analysis:
1.Doing updateOomAdjInnerLSP in backgroud, and it would last for a long
time
2.Now start a new Activity, windowManager save the latest topUid into PendingStartActivityUids
3.updateOomAdj task in step.1 done, and then delete all uids in PendingStartActivityUids
4.The topApp will be rejected by AppOps due to the deleting in step.3

Signed-off-by: huang chaopeng <huangchaopeng@oppo.corp-partner.google.com>
Change-Id: I52c7c2a8d6cb86b27b1f008cb56f670ce7698dc9
2022-03-24 10:47:35 +08: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
Mark Renouf
05a2ef2647 Remove permission token from startActivityAsCaller
The call is protected by the signature permission
START_ACTIVITY_AS_CALLER. This will remove the need for additional data
to be passed from system server.

Bug: 222082547
Bug: 226354782
Test: atest ActivityTaskManagerServiceTests, atest ChooserActivityTest,
      manual testing
Change-Id: I94f34a68e390569ec14dfebb1902a7c30558864f
2022-03-23 14:55:01 +00:00
kholoud mohamed
4b2931194e RESTRICT AUTOMERGE Rename PermissionController resource constants
Bug: 217388602
Test: N/A
Change-Id: I61b052ef831d38379adf6164cb881a1c9b2ea46a
2022-03-23 14:19:02 +00:00
Rubin Xu
a441d81b3a Merge "Secure REMOTE_BUGREPORT_DISPATCH" into tm-dev 2022-03-23 11:26:52 +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
ace23e0e89 Merge "Read custom background when creating ActivityOptions from bundle" into tm-dev 2022-03-22 10:47:56 +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
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
8c1fad0d74 Merge "Fix #testChangeFontScaleNoRelaunch flaky" into tm-dev 2022-03-21 08:51:45 +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
4b61ecc716 Merge "Add ACCESS_BROADCAST_RESPONSE_STATS permission." into tm-dev 2022-03-19 05:14:21 +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
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
Hui Yu
bb89d23c33 Increase startForeground() timeout to 30 seconds.
Right now there is 10 seconds grace period from Context.startForegroudService() to Service.startForeground() call, afterwards
we crash the app and thow ForegroundServiceDidNotStartInTimeException, at the same time generate ANR report.

Make the startForegroundService() to startForeground() grace period
configurable, increase the default value from 10 seconds to 30 seconds.
This value can be changed by command "adb shell device_config put activity_manager
service_start_foreground_timeout_ms 30000"

After the 30 seconds service_start_foreground_timeout_ms and ForegroundServiceDidNotStartInTimeException, delay the ANR generation for another 10
seconds configurable by service_start_foreground_anr_delay_ms.
This value can be changed by "adb shell device_config put activity_manager service_start_foreground_anr_delay_ms 10000".
At the end of service_start_foreground_anr_delay_ms, if the app's
process is still alive, the ANR report will be taken. Otherwise, there
is no ANR report.

Bug: 219514357
Test: adb shell device_config put activity_manager service_start_foreground_timeout_ms,
adb shell device_config put activity_manager service_start_foreground_anr_delay_ms,
Manual test, in test app, startForegroundService() but not call startForeground(), 30 seconds later, observe the ForegroundServiceDidNotStartInTimeException, 10 seconds later, try to take the ANR report.

Change-Id: I5f30d0996bff23f8a302cedef01eaa31e6ff29ce
2022-03-18 15:19:06 -07: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
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
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
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
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
8c241a637e Merge "Make config_devicePolicyManagementUpdater readable by tests" into tm-dev 2022-03-18 12:59:26 +00:00
Antoan Angelov
efdd8dba93 Merge "Update javadoc for EXTRA_PROVISIONING_ROLE_HOLDER_CUSTOM_USER_CONSENT_INTENT" into tm-dev 2022-03-18 12:55:56 +00:00
Antoan Angelov
c2b95ea6aa Merge "Add a new result code for the DPMRH updater to signal that the feature is disabled" into tm-dev 2022-03-18 12:51:07 +00:00
Antoan Angelov
9d06c94e7c Merge "Make EXTRA_PROVISIONING_USE_MOBILE_DATA public API" into tm-dev 2022-03-18 12:47:09 +00:00