Commit Graph

3723 Commits

Author SHA1 Message Date
TreeHugger Robot
65032453d0 Merge "Hotword: Rename the api in HotwordAudioStream" 2022-10-19 00:55:37 +00:00
Julia Reynolds
38b3e55858 Merge "Add NLS Settings link" 2022-10-18 19:32:23 +00:00
Chris Poultney
c22d2ce264 Merge "Lock screen live wallpaper: adds home/lock screen flag as argument." into tm-qpr-dev am: 0f8f2d726b am: e5e1aa95a5
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/20122170

Change-Id: Iedfe67b28f3a950a989b229bb2da14320b991fd9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-10-18 16:16:04 +00:00
Chris Poultney
e5e1aa95a5 Merge "Lock screen live wallpaper: adds home/lock screen flag as argument." into tm-qpr-dev am: 0f8f2d726b
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/20122170

Change-Id: Ib4e2321373420b1c7fdfd47cca372bbf3baa122a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-10-18 15:45:18 +00:00
Chris Poultney
0f8f2d726b Merge "Lock screen live wallpaper: adds home/lock screen flag as argument." into tm-qpr-dev 2022-10-18 15:06:21 +00:00
Julia Reynolds
62b0335e61 Add NLS Settings link
Bug: 236932102
Test: general cts test for validating constants
Change-Id: I027a664d29a56c63aa57f96597f5462063fd3e94
2022-10-17 13:58:48 -04:00
Ivan Chiang
38ffe373c3 Hotword: Rename the api in HotwordAudioStream
- Rename mAudioStream to mAudioStreamParcelFileDescriptor
- Return Collections.emptyList() in defaultAudioStreams in
  HotwordDetectedResult

Test: atest CtsVoiceInteractionTestCases
Bug: 253179545
Change-Id: I39fb7a7ae14f6480114df254daf35f1f1b310879
2022-10-17 03:33:31 +00:00
Chris Poultney
43a06cf7e3 Lock screen live wallpaper: adds home/lock screen flag as argument.
Adds flag to wallpaper setting methods to allow specifying
home/lock/both. This will be implemented in master.

Bug: 253481667
Test: TreeHugger
Change-Id: I590b2972b102fba672726633a86727b167a4b02b
2022-10-13 21:37:46 +00:00
TreeHugger Robot
33cef05d7d Merge "Refactor updateState method for trusted hotword" 2022-10-13 02:59:06 +00:00
Joanne Chung
a52eb3afeb Merge "Report ActivityId in Content capture ActivityEvent" 2022-10-13 02:33:13 +00:00
Darrell Shi
a159980590 Merge "Redraw dream overlay when a new dream is connected." into tm-qpr-dev am: eabe3bf0c1 am: 295bb52ca9
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/20041858

Change-Id: I0818bd7d7d089e0cf45d40e0a8529cae978c9196
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-10-12 21:52:29 +00:00
Darrell Shi
295bb52ca9 Merge "Redraw dream overlay when a new dream is connected." into tm-qpr-dev am: eabe3bf0c1
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/20041858

Change-Id: Idd25f2e09016a1e6db4a6b30bfaab420403f5cab
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-10-12 21:31:12 +00:00
Darrell Shi
51afda7a0e Redraw dream overlay when a new dream is connected.
Now that we allow two dreams to have a breif overlap to have a smooth
transition, the overlay service can be bound to by two dreams at once.
Extras put in the intent are now moved to startDream because onBind()
is called only when the first dream is connected to it.

Also fix a bug that under an edge case where the service is destroyed
before dream is started, removing the view from window manager throws an
illegal argument exception.

Bug: 244315094
Bug: 249038780
Bug: 248496636
Fix: 244315094
Fix: 249038780
Test: atest DreamOverlayServiceTest
Test: manually on device, see video in bug

Change-Id: I8278e5b40a25539ce68a9c17c6cec9387d2da201
2022-10-12 18:27:38 +00:00
TreeHugger Robot
a2f02ea1e8 Merge "Update DreamService -> DreamOverlayService connection to handle crashes" into tm-qpr-dev am: 2ab63d23d3
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/20107778

Change-Id: Ied0ea3a6d52dab588907872f3170547a667b0b15
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-10-12 15:16:58 +00:00
TreeHugger Robot
2ab63d23d3 Merge "Update DreamService -> DreamOverlayService connection to handle crashes" into tm-qpr-dev 2022-10-12 14:53:54 +00:00
Joanne
43af15ea0e Report ActivityId in Content capture ActivityEvent
Currently, the ActivityEvent only reports ComponentName and the event
type. It may be a problem when launching the split mode for tablet.
If the Activity launch mode is standard or singleTop, system allows
to launch the same Activity in split mode. The ContentCaptureService
cannot identify two different Activities instances in the split mode.

To resolve this problem, the system will also report ActivityId in
ActivityEvent to help ContentCaptureService to identify the Activity.

Bug: 245023463
Test: atest CtsContentCaptureServiceTestCases
Change-Id: I8a79633a8ff0e5a99dc154bb4002a418b2e98219
2022-10-12 19:28:39 +08:00
lpeter
ec669ddecd Refactor updateState method for trusted hotword
Test: atest CtsVoiceInteractionTestCases
Bug: 193232191
Change-Id: I781f9595e9c5016ba81e478e7f550d805699f7fb
2022-10-12 17:55:32 +08:00
Lucas Silva
7856a35e20 Update DreamService -> DreamOverlayService connection to handle crashes
This change implements PersistentServiceConnection and
ObservableServiceConnection helper classes in framework for better
handling of crashes.

Fixes: 247103878
Test: manually by crashing systemui using adb while dreaming and
verifying that the overlay is visible
Test: atest com.android.internal.util.PersistentServiceConnectionTest
Test: atest com.android.internal.util.ObservableServiceConnectionTest

Change-Id: Ib9a7e8675e408c1724567335a3c186fe5c9f5f59
2022-10-12 03:25:28 +00:00
TreeHugger Robot
e53dd06c28 Merge "Hotword: Add HotwordAudioStream list in HotwordDetectedResult" 2022-10-11 23:48:54 +00:00
Darrell Shi
5a1d585251 Merge changes Icea03eb6,Idad15d8e into tm-qpr-dev am: 4ccdca90b7 am: f0ab402957
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/20154874

Change-Id: I9aca9c07b5c9988780b1fb2dbd8fd43f19f9e33c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-10-11 19:41:50 +00:00
Darrell Shi
f0ab402957 Merge changes Icea03eb6,Idad15d8e into tm-qpr-dev am: 4ccdca90b7
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/20154874

Change-Id: If40eee9299d0bfaa505b97f0aba154ed6993e50c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-10-11 16:47:22 +00:00
Darrell Shi
4ccdca90b7 Merge changes Icea03eb6,Idad15d8e into tm-qpr-dev
* changes:
  Add more specific start/stop dream reasons.
  Dream manager improvements.
2022-10-11 16:15:11 +00:00
Yuri Lin
627ab4a106 Merge "Fix existing dismissal surfaces, add one for lockscreen" into tm-qpr-dev am: a742754e6e am: 9f3955ccfd
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/20132294

Change-Id: I7231b25cdafce162d899d27924f6000071c6a011
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-10-11 16:08:21 +00:00
Yuri Lin
9f3955ccfd Merge "Fix existing dismissal surfaces, add one for lockscreen" into tm-qpr-dev am: a742754e6e
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/20132294

Change-Id: I69c8ae895f9bf5b7543171e3c2f269b1e7a9a079
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-10-11 15:34:31 +00:00
Lucas Silva
7bbcdc1c01 Update DreamService -> DreamOverlayService connection to handle crashes
This change implements PersistentServiceConnection and
ObservableServiceConnection helper classes in framework for better
handling of crashes.

Fixes: 247103878
Test: manually by crashing systemui using adb while dreaming and
verifying that the overlay is visible
Test: atest com.android.internal.util.PersistentServiceConnectionTest
Test: atest com.android.internal.util.ObservableServiceConnectionTest

Change-Id: Ib9a7e8675e408c1724567335a3c186fe5c9f5f59
Merged-In: Ib9a7e8675e408c1724567335a3c186fe5c9f5f59
2022-10-11 13:37:59 +00:00
Ivan Chiang
63935a3fee Hotword: Add HotwordAudioStream list in HotwordDetectedResult
- Create the new data class HotwordAudioStream
- Add HowordAudioStream list into HotwordDetectedResult

Test: atest CtsVoiceInteractionTestCases
Bug: 243766281
Bug: 243597982
Change-Id: I0953a93195699b17d4a69bba6c4140bc91eecb79
2022-10-11 04:44:35 +00:00
Darrell Shi
312db22a14 Add more specific start/stop dream reasons.
As dreams get more complex, we would like more specific loggings for how
dreams are started/stopped for better debugging.

This CL adds "reason" as a required parameter in the start/stop dream
internal/private API. This allows callers to specify reasons.

Bug: 252796782
Fix: 252796782
Test: verified reasons are correctly logged on device
Change-Id: Icea03eb6e23ca113f50fa047f6d57e6e1d0b5604
2022-10-10 20:17:05 +00:00
Yuri Lin
6303141f40 Fix existing dismissal surfaces, add one for lockscreen
DISMISSAL_BUBBLE previously had the same value as DISMISSAL_SHADE, so bubble dismissals weren't getting counted correctly. It also needed to be added as a new UiEvent on the logging side so that the dismissal surface could be handled correctly. This dismissal surface is getting set by BubbleManager already, so the necessary changes should be limited to the logging side.

This change also adds a new dismissal surface for the lockscreen, in conjunction with the already existing UiEvent enum for NOTIFICATION_CANCEL_USER_LOCKSCREEN. However, this change does not yet add correct handling of new dismissal surface on the side where notifications get dismissed; that will be in an upcoming change.

Bug: 234507856
Fixes: 252821281
Test: statsd_testdrive
Change-Id: Ib8fe37dc1277c55de1c26a5e2b3835b3a9f3c941
2022-10-10 15:54:07 -04:00
Reema Bajwa
01e3d07d32 Add OutcomeReceiver to provider APIs and share classes with developer
APIs
Test: Built locally
CTS-Coverage-Bug:247549381

Change-Id: I95a4149124b1e446727a093d54e10a5a39173e56
2022-10-10 17:15:01 +00:00
TreeHugger Robot
c62b828382 Merge "Add @TestApi for the methods of VoiceInteractionSession.ActivityId" 2022-10-06 20:51:43 +00:00
Eric Zhang
a02bc77ce4 Merge "Add new owner to the resume-on-reboot module." am: ac46d9b163 am: 20fedd9d79 am: 53cdc22b87
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2241511

Change-Id: Ie4296d3927d9f7a6124958c3d7c5d1d25f30ad53
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-10-06 19:42:43 +00:00
Eric Zhang
53cdc22b87 Merge "Add new owner to the resume-on-reboot module." am: ac46d9b163 am: 20fedd9d79
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2241511

Change-Id: I63653551f719327d3152cad5c95b313470a82364
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-10-06 18:50:49 +00:00
TreeHugger Robot
d6e7cef873 Merge "Inform Assistant visible activity when the stage of activity lifecycle is invoked." 2022-10-06 02:08:43 +00:00
Eric Zhang
8c8d787bc6 Add new owner to the resume-on-reboot module.
Test: Adding owners. No code change.
Change-Id: I5af32f68652d5854e6a99b59f2f56fcaac575588
2022-10-06 01:43:17 +00:00
Lucas Silva
56c7859f7f Merge "Fix PowerManager#dream API by partially rolling back ag/19763724" into tm-qpr-dev am: 9b428b25c9 am: 1bd1382504
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/20103484

Change-Id: I240ea07bfcda154ad60639eb94f6a9958eba38ea
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-10-05 17:24:29 +00:00
Lucas Silva
1bd1382504 Merge "Fix PowerManager#dream API by partially rolling back ag/19763724" into tm-qpr-dev am: 9b428b25c9
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/20103484

Change-Id: Ie6ab565103190fca346c6e33f5710dcefd997c6b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-10-05 14:32:39 +00:00
Lucas Silva
7cf2634f91 Fix PowerManager#dream API by partially rolling back ag/19763724
ag/19763724 modified Sandman.java to use LocalServices, but it turns out
that Sandman.java is exposed to clients via PowerManager - where
LocalServices isn't available. This caused PowerManager#dream to break

Fixes: 249916607
Test: atest UiModeManagerServiceTest
Test: "OKG go to ambient" voice command
Change-Id: I3e031593568fdb7b92a1209823463832feeb1601
2022-10-03 14:54:31 -04:00
lpeter
7b9ff958e5 Add @TestApi for the methods of VoiceInteractionSession.ActivityId
In order to verify which activity has become visible or
invisible, we need to add @TestApi for the methods of
VoiceInteractionSession.ActivityId class to get activity
data.

Bug: 246456675
Bug: 235296082
Test: atest VoiceInteractionSessionVisibleActivityTest
Change-Id: Ic659f23b7681a91d070cc841c8f7503b84b78092
2022-09-29 19:39:34 +00:00
Peter Li
29bb3a3428 Inform Assistant visible activity when the stage of activity lifecycle is invoked.
By the original design, we register the activity event in the
ActivityManagerService. After getting the activity event, we will
query current visible activities and report them to Assistant.
Assistant will start to get direct actions of those visible
activities. But sometimes they can not get the direct actions
due to the stage of activity lifecycle before onStart().

We change the logic to make sure that the stage of visible
activity that we reported to the Assistant is after onStart().

Bug: 235296082
Test: atest VoiceInteractionSessionVisibleActivityTest
Test: atest android.app.activity.ActivityThreadClientTest
Test: atest android.view.DisplayTest
Test: atest android.window.ConfigurationHelperTest
Test: atest android.window.SizeConfigurationBucketsTest
Change-Id: Ie439ff3706dab35e875c1eb995a67fa73aec4d76
2022-09-29 15:20:10 +00:00
Reema Bajwa
3ad6f8d275 Merge "Add provider facing CREATE APIs for Credential Manager." 2022-09-28 15:37:12 +00:00
Reema Bajwa
cdc587d3c2 Merge "Add provider facing GET APIs for Credential Manager." 2022-09-28 15:34:11 +00:00
TreeHugger Robot
a9b13c7574 Merge "Disallow combining trusted and non-trusted detectors" 2022-09-28 08:17:30 +00:00
Reema Bajwa
16225e2311 Add provider facing CREATE APIs for Credential Manager.
Credential Manager is a set of APIs that allows developers to get and
create credentials. These credentials are sourced from providers that
are registered with the android framework.

Test: Built and Deployed on device locally.
Bug: 247545196
CTS-Coverage-Bug: 247549381

Change-Id: I640259d5c803260740633f489a8bcf3a4168b652
2022-09-27 23:21:15 +00:00
Reema Bajwa
9238ef2142 Add provider facing GET APIs for Credential Manager.
Credential Manager is a set of APIs that allows developers to get and
create credentials. These credentials are sourced from providers that
are registered with the android framework.

Test: Built and Deployed on device locally.
Bug: 247545196
CTS-Coverage-Bug: 247549381
Change-Id: If5b6569810be30ec6f7997e9161fe9b85d286cfc
2022-09-27 20:59:16 +00:00
Daniel Kim
c03340cbcb Merge "Disable proximity result for hotword" into tm-qpr-dev am: 4e528edd31 am: c031c0feb2
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/20001718

Change-Id: I02e1d839409d3f00d1ad07f094d5b637af3904e6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-26 08:43:35 +00:00
Daniel Kim
c031c0feb2 Merge "Disable proximity result for hotword" into tm-qpr-dev am: 4e528edd31
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/20001718

Change-Id: Id9b34e02f6af5e30585fc3dae70377d52b1b621e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-26 08:22:43 +00:00
Daniel Kim
4e528edd31 Merge "Disable proximity result for hotword" into tm-qpr-dev 2022-09-26 08:12:46 +00:00
Lucas Silva
00a4f69a91 Merge "Hide the status bar dream overlay when low light is active." into tm-qpr-dev am: 2da886cb7d am: 09217538b9
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19993591

Change-Id: I3fd503a05d4ca1be80e7b50d44c5be315adb04b7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-23 21:23:38 +00:00
Lucas Silva
09217538b9 Merge "Hide the status bar dream overlay when low light is active." into tm-qpr-dev am: 2da886cb7d
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19993591

Change-Id: Idd4f82b99bbe8dacb59568c44ebe9f65e7712d23
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-23 20:49:46 +00:00
Lucas Silva
2da886cb7d Merge "Hide the status bar dream overlay when low light is active." into tm-qpr-dev 2022-09-23 20:22:48 +00:00