Commit Graph

20053 Commits

Author SHA1 Message Date
Mady Mellor
713fa317c7 Merge "Bubble API: intent extra for bubbled activities" into sc-dev am: b91377962d
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13418961

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I633dc748615a47855419c9421fd611462afd8e85
2021-02-11 01:56:26 +00:00
Mady Mellor
b91377962d Merge "Bubble API: intent extra for bubbled activities" into sc-dev 2021-02-11 00:35:56 +00:00
Winson Chung
0a23bb9b28 Merge "Save and pass last snapshot data with recents task info" into sc-dev am: d0c7c20e88
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13511382

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I5a6ab1b94885cec5efbbd5e1d7f104dbddac6bac
2021-02-10 19:26:55 +00:00
Winson Chung
d0c7c20e88 Merge "Save and pass last snapshot data with recents task info" into sc-dev 2021-02-10 18:57:41 +00:00
Benjamin Franz
d383cf33ff Merge "Add OWNERS file to core/java/android/app/compat" am: efea156fe5 am: ebb589a5a2 am: 6d10995b52 am: 85c0b24064
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1582885

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I795de8b5868756635ca48a45ea18474debd6da11
2021-02-10 17:49:06 +00:00
Benjamin Franz
85c0b24064 Merge "Add OWNERS file to core/java/android/app/compat" am: efea156fe5 am: ebb589a5a2 am: 6d10995b52
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1582885

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Id123f45dd96d35a7c09f11d51ba943b9ad474c57
2021-02-10 16:56:27 +00:00
Kholoud Mohamed
1e1d571c9d Merge "Log PO and DO provisioning params" into sc-dev am: bf03ae3b78
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13517171

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: If69f793e281aaea3203eac8bbd181ab11f440481
2021-02-10 16:46:09 +00:00
Benjamin Franz
6d10995b52 Merge "Add OWNERS file to core/java/android/app/compat" am: efea156fe5 am: ebb589a5a2
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1582885

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I10c2ecf0eb054adc8b0973b1937771288c879e86
2021-02-10 16:42:03 +00:00
Benjamin Franz
efea156fe5 Merge "Add OWNERS file to core/java/android/app/compat" 2021-02-10 15:49:10 +00:00
Kholoud Mohamed
bf03ae3b78 Merge "Log PO and DO provisioning params" into sc-dev 2021-02-10 15:48:55 +00:00
Benjamin Franz
9d5d929b00 Add OWNERS file to core/java/android/app/compat
Bug: 174043039
Test: N/A
Change-Id: I308f85edee7b8e01f15e2ee632941bd29cd5d212
2021-02-10 10:47:17 +00:00
Winson Chung
71718ad748 Save and pass last snapshot data with recents task info
- Adds task & snapshot sizing info to RecentTaskInfo so that SysUI can
  stably layout overview when there are tasks of different sizes
- Removing some unused code

Bug: 179466077
Test: atest WmTests:RecentTasksTest
Change-Id: Idf4c27e2d04380328413459fc537ff8bcc111a14
2021-02-09 22:10:10 -08:00
TreeHugger Robot
20fe1f31d9 Merge "Adding toString in SmartspaceTargetEvent" into sc-dev am: 85073a40c1
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13537185

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I98f03882482cff5ec5cbb506b825c14111ffdda4
2021-02-10 03:11:07 +00:00
TreeHugger Robot
85073a40c1 Merge "Adding toString in SmartspaceTargetEvent" into sc-dev 2021-02-10 02:43:55 +00:00
Jeff DeCew
0c415c0f40 Merge changes from topic "notif_call_style_sc" into sc-dev am: 4db015d00e
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13532768

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ie40afb9b3b131486d30fc0b3d87a95f3b7cc37d9
2021-02-10 01:27:52 +00:00
Jeff DeCew
4db015d00e Merge changes from topic "notif_call_style_sc" into sc-dev
* changes:
  Stop using ?attr/notificationHeaderTextAppearance
  Remove unused 'app_ops' from layout
  Implement Notification.CallStyle
2021-02-10 00:42:26 +00:00
Shashwat Razdan
3ef21c78f5 Adding toString in SmartspaceTargetEvent
Bug: 176851064
Test: Manual
Change-Id: I14e554817642447da315c8aeccfed83256155e58
2021-02-09 15:32:52 -08:00
Amith Yamasani
82f631d86d Merge "Make UsageStats query API UserHandle-aware" into sc-dev am: 51fbb49435
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13514570

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I8f5166eb3dbadba50286c9498f4719cf6ea169cc
2021-02-09 19:20:58 +00:00
Amith Yamasani
51fbb49435 Merge "Make UsageStats query API UserHandle-aware" into sc-dev 2021-02-09 19:19:06 +00:00
Tim Van Patten
b565addeb8 Merge "Add proper permission check and multi-user handling to GameManagerService" into sc-dev am: d8850ff6b9
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13454824

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I9e30908c1b1b491d4161c85081b117b92a9421ef
2021-02-09 17:52:28 +00:00
Tim Van Patten
d8850ff6b9 Merge "Add proper permission check and multi-user handling to GameManagerService" into sc-dev 2021-02-09 17:31:38 +00:00
TreeHugger Robot
2a6c4af5c5 Merge "Add overlayPaths to ApplicationInfo" into sc-dev am: 419f4eeb6c
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13429374

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I03e3d6597d8a1f329faab00b8ad018b0124bff57
2021-02-09 17:16:48 +00:00
TreeHugger Robot
419f4eeb6c Merge "Add overlayPaths to ApplicationInfo" into sc-dev 2021-02-09 17:05:34 +00:00
Jeff DeCew
4118f1ad35 Implement Notification.CallStyle
Test: atest CtsAppTestCases:NotificationTemplateTest
Bug: 172821692
Fixes: 179218218
Change-Id: Ic37d913946f81a581c26ab1b71f6d6e1bdc6a932
2021-02-09 11:54:47 -05:00
TreeHugger Robot
baa7b91fd3 Merge "Block calls to canAdminGrantSensorsPermissions on parent" into sc-dev am: 77cad7c3d9
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13518736

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: If5e32386b10a29b08739a46ab3d03abe0dfadea3
2021-02-09 15:57:24 +00:00
kholoud mohamed
99a0c9fa6d Log PO and DO provisioning params
Log the params that were used to call
DPM#provisionFullyManagedDevice and
DPM#createAndProvisionManagedProfile

Bug: 178458861
Test: Verified manually that the metrics are being reported
Change-Id: I07eca0e50c4d700b1ba823158da0d074aee0ad59
2021-02-09 13:53:42 +00:00
Eran Messeri
cf9227656d Block calls to canAdminGrantSensorsPermissions on parent
Throw if canAdminGrantSensorsPermissions is called on the parent profile
instance.

That would fix ManagedProfileTest#testParentProfileApiDisabled

Bug: 179726587
Test: atest ManagedProfileTest#testParentProfileApiDisabled
Change-Id: I7ff654674ad412ac9a9219a1a470b50da928ea10
2021-02-09 13:44:58 +00:00
TreeHugger Robot
ac05f2d970 Merge "Apply fixed rotation animation for pip to fullscreen" into sc-dev am: ca7f10993f
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13425308

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I64eee759eff3ea5147d45dc431a45cfbb7470df7
2021-02-09 07:17:29 +00:00
TreeHugger Robot
ca7f10993f Merge "Apply fixed rotation animation for pip to fullscreen" into sc-dev 2021-02-09 07:08:02 +00:00
Tim Van Patten
eadc65c2df Add proper permission check and multi-user handling to GameManagerService
Add the following permissions which are used by GameManagerService:
- permission.MANAGE_GAME_MODE

Additionally, enforce multi-user handling with
ActivityManager.handleIncomingUser().

Bug: b/178111358
Test: atest GameManagerTests
Test: atest GameManagerServiceTests
Test: atest GameManagerServiceSettingsTests
Test: atest PermissionPolicyTest
Change-Id: Ib503a8f50746d4079d32bd0515b6a9c771b6792f
2021-02-08 21:56:50 -07:00
Mady Mellor
1ecb1ccb9a Bubble API: intent extra for bubbled activities
Apps need a better way to check if their shortcut or
pending intent is bubbled, to do this we'll add an intent
extra on the bubbled activity that they may check.

- updated doc around bubbles for how to check the extra
- applied flag on activity for intent & shortcut

Bug: 171220648
Test: atest NotificationManagerTest (see CTS CL)
Change-Id: Iba97a0058e1e4fc33c4df32a3f258ff350ad04e2
2021-02-08 14:04:18 -08:00
Jeff Sharkey
5c037209a8 Merge "Add resource owners" am: d25ad6a116 am: 80382deadc am: 5195eb9abe am: 5a0c28dcf6
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1580196

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ic12df74838a87faa2bb1abe4a2023cf583a54039
2021-02-08 18:35:54 +00:00
Jeff Sharkey
5a0c28dcf6 Merge "Add resource owners" am: d25ad6a116 am: 80382deadc am: 5195eb9abe
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1580196

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I8ac2127766ab9f24ab3110c08a94ebba25b4d00f
2021-02-08 17:50:22 +00:00
Jeff Sharkey
5195eb9abe Merge "Add resource owners" am: d25ad6a116 am: 80382deadc
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1580196

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I1d3562d61b9a663a5911df18230867652d56ce51
2021-02-08 17:46:50 +00:00
Todd Kennedy
ce6c266d1a Add resource owners
Change-Id: I182d6b167ed33fa0d817e70c7811aa6a22840a69
2021-02-08 16:20:28 +00:00
Zimuzo Ezeozue
2d33d89677 Merge "Add AnrController to control ANR dialog delay" into sc-dev am: a0735849df
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13472410

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I6a30dbaa43a0bc81f22557cca288eeebbc00c796
2021-02-08 11:28:18 +00:00
Zimuzo Ezeozue
a0735849df Merge "Add AnrController to control ANR dialog delay" into sc-dev 2021-02-08 11:12:50 +00:00
Ryan Mitchell
da9ee1406e Add overlayPaths to ApplicationInfo
RROs have historically been APK packages. We now have the ability to
generate RROs on-the-fly. These "fabricated" RROs are not APKs.
ApplicationInfo#resourceDirs documentation states that it only contains
paths to packages. To prevent changing the behavior of resourceDirs
until we can deprecate and remove it, a new overlayPaths field has been
added to ApplicationInfo. This new field contains APK overlay paths as
well as non-APK overlay paths.

Bug: 172471315
Test: boot enable/disable overlays and examine overlays working as well
      as package manager dumpsys
Change-Id: I78c5eeef73b7d8bada61edc0f64a12a3cdc1ce16
2021-02-08 00:28:58 -08:00
Amith Yamasani
d4de97915b Make UsageStats query API UserHandle-aware
Allow queryUsageStats to take in the context's userId. This
allows apps like Settings to query usage stats across
profiles.

Bug: 146921442
Test: atest CtsUsageStatsTestCases:UsageStatsTests
Change-Id: Ia6c90c1a31887efa8d5446c1b1b11e75cb9ab83e
2021-02-07 21:45:43 -08:00
Riddle Hsu
c0e5b3d92f Apply fixed rotation animation for pip to fullscreen
The activity surface is rotated by WM core when changing
the windowing mode of PiP activity to fullscreen. And then
PipTaskOrganizer#onFixedRotationStarted will be called before
WindowContainerTransactionCallback#onTransactionReady. So
PipTaskOrganizer can use the given new rotation to run the
animation in current rotation. After the animation is done,
PipTaskOrganizer will set the task to fullscreen, that makes
previous top activity pause and then resume the next top
activity (the original PiP). Finally, the fixed rotation is
finished by transition done event, and then continue to
rotate the display seamlessly.

Also remove mInitialState from PipTaskOrganizer because it
is no longer needed for predicting the fullscreen bounds.

Bug: 165794724
Test: DisplayContentTests#testFixedRotationWithPip
      PipAnimationControllerTest#pipTransitionAnimator_rotatedEndValue
Test: Expand PiP in portrait which was in landscape

Change-Id: I5c1400ece9d80226bc35b497d308215010ead027
2021-02-08 12:25:27 +08:00
Charles Chen
52d0c25def Merge "Remove addWindowTokenWithOptions" into sc-dev am: 6e08c39554
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13435722

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I3d85607c43527b2cfaa194c962be5dfcbed8978e
2021-02-07 03:54:29 +00:00
Charles Chen
6e08c39554 Merge "Remove addWindowTokenWithOptions" into sc-dev 2021-02-07 03:14:57 +00:00
TreeHugger Robot
0dc467ad94 Merge "Indicator for admin control over sensor permission grants" into sc-dev am: 1b15e79c11
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13470208

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I43becec3ad12644bcb93c2b192cf249717730515
2021-02-07 00:51:26 +00:00
Eran Messeri
cb0bed367e Indicator for admin control over sensor permission grants
Add a flag indicating whether an admin may or may not control permission
grants for sensors-related permissions.

By default, on a fully-managed device, the admin may control sensor
permission grants. The admin may opt-out by providing the newly-added
provisioning extra, EXTRA_PROVISIONING_PERMISSION_GRANT_OPT_OUT.

On a managed profile, will no longer be able to control sensor
permission grants.

This change adds the provisioning extra and state flag in the
ActiveAdmin, a follow-up change will make the permission controller
utilize the flag.

Bug: 158735247
Test: atest android.devicepolicy.cts.DevicePolicyManagerTest
Test: atest com.android.cts.devicepolicy.MixedDeviceOwnerTest#testAdminControlOverSensorPermissionGrantsDefault com.android.cts.devicepolicy.MixedManagedProfileOwnerTest#testAdminControlOverSensorPermissionGrantsDefault com.android.cts.devicepolicy.MixedManagedProfileOwnerTest#testAdminControlOverSensorPermissionGrantsDefault com.android.cts.devicepolicy.MixedProfileOwnerTest#testAdminControlOverSensorPermissionGrantsDefault
Change-Id: Iffd02450ee624416eccda8301ff84676f226c0d0
2021-02-06 21:13:45 +00:00
Charles Chen
b80fdde45f Remove addWindowTokenWithOptions
Since WindowContext won't add WindowToken from the client side,
addWindowTokenWithOption is no more needed. Also remove the logic
to invoke removeWindowToken from the client side.

Bug: 159767464
Bug: 153369119
Test: atest WindowManagerServiceTests WindowManagerPermissionTests
Change-Id: Ib0c948dca223cf8d056865ce3a0d4adaef07d247
2021-02-06 15:47:08 +08:00
Antoan Angelov
4c308df1b4 [RESTRICT AUTOMERGE] Revert "[RESTRICT AUTOMERGE] Remove DPMS#getProfileOwner in favor of getProfileOwnerAsUser" am: c6bda518da
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13462269

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ia1a75f3468b7c316fb75dcfa2e270c73ee7a4553
2021-02-05 21:33:47 +00:00
Chris Tate
0130f64d8c Merge "Disallow deletion of channels with FGS notifications" 2021-02-05 19:26:33 +00:00
Kholoud Mohamed
53fb73b912 Merge "Remove no longer needed broadcasts" into sc-dev 2021-02-05 17:53:19 +00:00
Kholoud Mohamed
28d66d71df Merge "Add user settings and intent filters to userTypeDetails" into sc-dev 2021-02-05 17:53:19 +00:00
TreeHugger Robot
1ac8aa5aa4 Merge "Changing IntentSender to become a listener." into sc-dev 2021-02-05 17:27:10 +00:00