Commit Graph

3541 Commits

Author SHA1 Message Date
Xin Li
a94d90e35d Merge tm-qpr-dev-plus-aosp-without-vendor@9129937
Bug: 248070379
Merged-In: I9a53541e98c0ba596b288ae92fe75f3279aac9cb
Change-Id: I9b1190b0b25e15258fafae83c9d77123e935f96f
2022-10-06 22:37:55 -07: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
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
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
Daniel
4dd69f2ebb Disable proximity result for hotword
Introducing a flag to gate the Attention Service usage by Hotword
Detection Service. The Attention Service will be disabled by default.

Bug: 247890608
Test: atest CtsVoiceInteractionTestCases
Change-Id: Ic8a6a11b2a0843a96f135b360f10f7fef5fce274
2022-09-22 22:55:09 +00:00
Hui Wu
9af4e0bd3d Merge "Remove impl of cloudsearch api" into tm-qpr-dev am: aa0ffaee0d
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/20019599

Change-Id: I8475cd36abd09908238d7e996dcc9f5dbf14b784
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-22 22:50:42 +00:00
Hui Wu
1a25dca0bc Remove impl of cloudsearch api
Bug: 246376638
Test: Manually Tested
Change-Id: I1740d5e1a0fb25a0fedea0a92e8a901684e35635
2022-09-22 15:08:56 -07:00
Lucas Silva
0bfb405bd3 Hide the status bar dream overlay when low light is active.
We pipe the component name of the currently active dream into the
overlay service, and when the active dream is lowlight, we hide the
status bar.

Test: atest DreamOverlayStateControllerTest
Test: atest DreamOverlayStatusBarViewControllerTest
Test: manually on device by entering/exiting low light and ensuring the
status bar is hidden
Fixes: 245386662

Change-Id: I22973538bea19ef108360a319c70c878cfd81800
2022-09-22 13:12:53 -04:00
Yuri Lin
15bfe2203b Merge "Limit lengths of fields in Condition to a max length." into tm-qpr-dev am: f36bcf9739
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19953610

Change-Id: I1f744354fb637ca2ba9890fcef797c6a4c9b7471
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-15 15:17:35 +00:00
Yuri Lin
f36bcf9739 Merge "Limit lengths of fields in Condition to a max length." into tm-qpr-dev 2022-09-15 14:59:18 +00:00
Yuri Lin
81352c3775 Limit lengths of fields in Condition to a max length.
This app-generated input needs to not be too long to avoid errors in the process of writing to disk.

Bug: 242846316
Test: cts ConditionTest; atest ConditionTest; manually verified exploit apk is OK

Change-Id: Ic2fa8f06cc7a4c1f262115764fbd1be2a226b4b9
2022-09-14 15:27:11 -04:00
Aurélien Pomini
6417667198 Move ImageWallpaper.java into package 'com.android.systemui.wallpapers' am: 369f1b973e
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19695564

Change-Id: Icd17af82b132897dddd88164d32df55b1c3c635e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-13 13:47:58 +00:00
Aurélien Pomini
369f1b973e Move ImageWallpaper.java into package 'com.android.systemui.wallpapers'
Test: Manual on mobile (try to download & attach a wallpaper, check that
nothing breaks)
Test: atest ImageWallpaperTest
Bug: 243402530

Change-Id: I5af1acf08bb1c43a5e119597a9cef2ea667723c3
2022-09-12 09:49:31 +00:00
Beverly Tai
09914c7b42 Merge "Don't show any trust granted message if passed an empty string" into tm-qpr-dev am: 8129d7acb0
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19816375

Change-Id: I23f8d0d1fb2219c27cca567963cbba65b0903a5b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-09 20:47:45 +00:00
Beverly Tai
8129d7acb0 Merge "Don't show any trust granted message if passed an empty string" into tm-qpr-dev 2022-09-09 20:43:56 +00:00
Beverly
5dccdb24cf Don't show any trust granted message if passed an empty string
If the trustGranted call has flag DISPLAY_MESSAGE and
message is intentionally set to an empty string "", then
don't show ANY trust granted message. If the message is null
or DISPLAY_MESSAGE is not set when trust is granted,
then the device will show its default trust granted string.

Test: atest KeyguardIndicationControllerTest
Test: manually grantTrust with the FLAG_GRANT_TRUST_DISPLAY_MESSAGE
and an empty string. See that device has trust granted and doesn't
show any keyguard indication message.
Fixes: 243075236
Change-Id: Ic31a1758e9baa27b236f09ba8e656d15dd04e7f0
2022-09-07 15:57:29 +00:00
Lucas Silva
e264ab6190 Merge "Fix vulnerability that allowed attackers to start arbitary activities" into tm-qpr-dev am: de117f20ff
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19775871

Change-Id: Iad0b84f489fa749e146769650dc87cd7008e137a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-02 17:26:11 +00:00
Lucas Silva
de117f20ff Merge "Fix vulnerability that allowed attackers to start arbitary activities" into tm-qpr-dev 2022-09-02 17:18:21 +00:00
Lucas Silva
392cdcfea5 Merge "Don't start dreams immediately if keyguard is occluded when docked." into tm-qpr-dev am: deb4e7788a
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19763724

Change-Id: I51664a04a35c6a5f2817bcab427d1257d88132d9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-01 19:46:59 +00:00
Lucas Silva
deb4e7788a Merge "Don't start dreams immediately if keyguard is occluded when docked." into tm-qpr-dev 2022-09-01 17:09:01 +00:00
Darrell Shi
ec6724232e Merge "Add hidden system dream API in DreamManagerService." into tm-qpr-dev am: 68e81c211e
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19461449

Change-Id: I11f43a63201a0f56f8f61c56012d2f4fcaf69abe
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-01 16:49:50 +00:00
Lucas Silva
2ce1b7fd37 Fix vulnerability that allowed attackers to start arbitary
activities

Test: atest DreamServiceTest
Test: flashed device and verified dream settings works as expected
Fixes: 242845514
Change-Id: I6e90e3a0d513dceb7d7f5c59d6807ebe164c5716
2022-08-31 11:10:21 -04:00
Darrell Shi
3c94bacacd Add hidden system dream API in DreamManagerService.
This change
- adds a new private API in dream manager that allows a client with
  write dream permission to set a system dream component, which takes
  precedence over user configured dream
- fixes startDream() API in DreamManager which shouldn't take in a
  component name

Test: atest SystemDreamTest
Bug: 222529147
Change-Id: Iee9a0af1071e5ed57fa5bd4b0d06d8178118116e
2022-08-30 23:19:44 +00:00
Cole Faust
9b3a5fc03b Merge "Fix array-related errorprone warnings" am: a1eb8cf128 am: 44f8576073 am: 91d6c5b564 am: 6a79ae2567
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2186016

Change-Id: I7052a1f7391ed6701fe0e1036c27368609032e35
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-30 20:44:00 +00:00
Cole Faust
a1eb8cf128 Merge "Fix array-related errorprone warnings" 2022-08-30 18:03:01 +00:00
Lucas Silva
1e16b3c217 Don't start dreams immediately if keyguard is occluded when docked.
The keyguard must be showing and unoccluded, or the device is not
interactive (eg screen off) in order for dreams to be started
immediately when docked. This prevents dreams from starting if there is
an activity currently showing over the lockscreen.

Also includes some refactoring to be able to unit test this change,
since dock state changes were not previously tested.

Fixes: 233412496
Test: atest UiModeManagerServiceTest
Test: manually on device with keyguard occluded, unoccluded, and screen
off while docked

Change-Id: I12f1a4cf3ae4784e391e3c5a3fd1d50b4d4f7ecd
2022-08-30 09:56:06 -04:00
Treehugger Robot
cfdb4292fa Merge "Add dirtectories and OWNER files" am: 37310607aa am: 44028380e1 am: 5a543f5ac0 am: 87eb7a2711
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2193497

Change-Id: If1f13e509ddca2603de692d433ae6c554dc81359
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-26 20:30:52 +00:00
Cole Faust
584140c83a Fix array-related errorprone warnings
The ArrayEquals, ArrayHashCode, ArrayToString, and
ArraysAsListPrimitiveArray errorprone findings were
demoted from errors to warnings. Fix existing
occurrences of them so they can be made errors again.

Bug: 242630963
Test: RUN_ERROR_PRONE=true m javac-check
Change-Id: Ia6f216cc36ad0a5758f39fd9b34962cd4adf9d8e
2022-08-25 10:57:12 -07:00
Chloris Kuo
b5c3bf5638 Merge "Add new intent to open NAS detail settings page in NAS app." into tm-qpr-dev am: 235ce54b78
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19719514

Change-Id: I636e201479940226d8b8a0280d3c99e2ab87c343
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-24 22:59:01 +00:00
Chloris Kuo
235ce54b78 Merge "Add new intent to open NAS detail settings page in NAS app." into tm-qpr-dev 2022-08-24 22:37:57 +00:00
Chloris Kuo
f99fd3c87e Add new intent to open NAS detail settings page in NAS app.
Bug: 231492005
Test: manually on local device
Change-Id: I87361b640c5fc7b258e3e807e14baeab52a66953
Merged-In: I87361b640c5fc7b258e3e807e14baeab52a66953
2022-08-24 19:50:12 +00:00
Joanne Chung
ff672bc4db Merge "Fix toolbar announce wrong text." into tm-qpr-dev am: 3292a30a1c
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19632605

Change-Id: If97f639c018bec3bcdb7e66b4e0d6b5b0848eadd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-24 01:12:26 +00:00
Joanne Chung
3292a30a1c Merge "Fix toolbar announce wrong text." into tm-qpr-dev 2022-08-24 01:07:32 +00:00
Reema Bajwa
827821d058 Add dirtectories and OWNER files
Change-Id: I8c6cf6632696f128e1cc68e3850448a33c3d79f3
2022-08-23 18:15:22 +00:00
Daniel Kim
1c307b4ee5 Revert^2 "Add proximity state to the HotwordDetectedResult" am: aa972f2c88
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19619189

Change-Id: Ia20d28254c35ede309ac0887d5747aad13371c3f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-20 01:55:19 +00:00
Daniel Kim
7811c2b731 Merge changes from topic "hotword_qpr" into tm-qpr-dev
* changes:
  Revert "Revert "Refactor ProximityUpdateCallbackInternal to inte..."
  Revert^2 "Add proximity state to the HotwordDetectedResult"
2022-08-20 01:30:46 +00:00
Joanne
53d6f568ec Fix toolbar announce wrong text.
This is a regression during refactor toolbar code, we don't intent
to announce the toolbar popup window so we should not set content
description for the container.

Bug: 239563674
Test: manual. Turn on talkback and make sure the announce is correct
and the behavior is the same
Test: atest TextViewIntegrationTest pass for local/remote
Test: atest TextViewActivityTest pass for local/remote
Test: atest SuggestionsPopupWindowTest pass for local/remote

Change-Id: I6e30d2f6d9a2c4905b702c25655fe5e4eb7de5d5
2022-08-19 13:42:24 +00:00
Mady Mellor
dfe71854c4 Merge "Add a method in IDreamManager to check if dreaming OR in dream preview" into tm-qpr-dev am: 3448c2fe1c
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19603443

Change-Id: I003dde1065c5d16c44bd63d7693b593d157fe47e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-17 19:25:56 +00:00
Mady Mellor
3448c2fe1c Merge "Add a method in IDreamManager to check if dreaming OR in dream preview" into tm-qpr-dev 2022-08-17 18:51:28 +00:00
Joanne Chung
20dbe919b1 Merge "Fix system toolbar doesn't use correct theme." into tm-qpr-dev am: 9e263e643d
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18800482

Change-Id: Ie4da503e5f569625c807bef1a194764cb5e133fe
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-16 13:08:55 +00:00
Joanne Chung
9e263e643d Merge "Fix system toolbar doesn't use correct theme." into tm-qpr-dev 2022-08-16 10:00:57 +00:00
Tiger Huang
f114085baa Merge "Introduce IWindowSession#relayoutAsync" into tm-qpr-dev am: 81ae41092e
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19194952

Change-Id: Iec4854d8c93a0e58a588d0483833b99a1ec38455
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-16 09:04:33 +00:00
Tiger Huang
3712433349 Introduce IWindowSession#relayoutAsync
IWindowSession#relayoutAsync is similar to IWindowSession#relayout, but
the former is an oneway method which just sends the layout attributes to
the server. Since the client can compute its own window frame, it just
needs to send attributes to the server without getting blocked for
receving the window frame.

In somes cases, the client still needs to obtain things from the server.
Such as:

- When view visibility is changed. The client maybe not be able to
  receive the latest insets state while it is INVISIBLE or GONE. In this
  case, the client needs to obtain the frame and the insets state. Also,
  the client need to obtain the surface control when it becomes VISIBLE.

- When the insets state is stale but the config is up-to-date. This can
  happen when WindowProcessController sends the new config to the client
  before WindowState does. In this case, the client needs to obtain the
  window frame from the server.

- When the position and the size of the frame are both changed. This
  will trigger a BLAST sync, and the client needs to obtain the sync seq
  ID.

For cases above, the client needs to call the original relayout method.

Bug: 161810301
Bug: 175861051
Test: Seamless rotation, fixed rotation, and regular rotation.
Merged-In: Ifb365789fa08103773fd3180e486ba1d92042fc5
Change-Id: Ifb365789fa08103773fd3180e486ba1d92042fc5
2022-08-16 12:49:31 +08:00
Daniel Kim
aa972f2c88 Revert^2 "Add proximity state to the HotwordDetectedResult"
Reverting the previous revert commit which was merged to resolve the
broken tests. Adding a fix to the broken tests by surrounding
mAttentionManagerInternal with null checks.

dbe5ad1a72

Test: atest CtsVoiceInteractionTestCases, atest CtsVoiceInteractionTestCases:android.voiceinteraction.cts.AlwaysOnHotwordDetectorTest#testAlwaysOnHotwordDetector_startRecognitionWithData -- --abi x86_64
Change-Id: Ife5fb9220518a32a89494217f56932f290cce5f3
Merged-In: Ife5fb9220518a32a89494217f56932f290cce5f3
2022-08-15 22:45:55 +00:00
Joanne Chung
9325f9b97e Fix system toolbar doesn't use correct theme.
The toolbar should set the theme to the app's theme. Because the
service cannot get the application context, we should pass this
information from application to service.

Bug: 218833400
Test: manual. Use light/dark theme for app, the toolbar shows with
the same theme
Test: atest TextViewIntegrationTest
Test: atest android.widget.TextViewActivityTest

Change-Id: I6d4e4e117c680ce57e760a87987059eded09b2bc
2022-08-12 16:54:34 +00:00
Mady Mellor
a652dac675 Add a method in IDreamManager to check if dreaming OR in dream preview
Currently there is no signal to identify that dreaming has started
from the 'preview' option in screen saver settings. This adds a
way to query IDreamManager for this state.

Bubbles needs a way to identify this so that they can hide when
the dream preview starts, otherwise it wouldn't be an accurate
preview.

Bug: 240510360
Test: manual - (with the CL on top of this), have some bubbles and
      trigger dream preview, observe that the bubbles hide.
Change-Id: I5f67a8c793970ada05a010c8d36fd4a47b3f8565
2022-08-11 17:27:57 -07:00
TreeHugger Robot
c7e39d86d0 Merge "Fixed VIMS to postpone ASSISTANT rule change on pre-created users." into tm-qpr-dev am: 9e9bd1e401
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19500510

Change-Id: I9701dfc031e362e1b7d1d10a05bdbd146171f3c3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-04 09:35:03 +00:00
Felipe Leme
88f2307219 Fixed VIMS to postpone ASSISTANT rule change on pre-created users.
RoleService should not be calling onRoleHoldersChanged() on
pre-created users, but that behavior cannot be changed because its
implemented by a system app, and pre-created users APIs are hidden.

To test it:

$ adb shell pm create-user --pre-create-only  --guest
Success: created user id 12

$ adb shell pm create-user --guest ElGuesto
Success: created user id 12

$ adb shell cmd user list --all -v
4 users:

0: id=0, name=Driver, type=system.HEADLESS, flags=ADMIN|INITIALIZED|PRIMARY|SYSTEM (running)
1: id=10, name=Driver, type=full.SECONDARY, flags=ADMIN|FULL|INITIALIZED (running) (current)
2: id=11, name=null, type=full.SECONDARY, flags=FULL|INITIALIZED (pre-created)
3: id=12, name=ElGuesto, type=full.GUEST, flags=EPHEMERAL|FULL|GUEST|INITIALIZED (converted)

$ adb shell am switch-user 12

$ adb shell dumpsys voiceinteraction |egrep '(mBound|implementation)'
  mBound=true mService=android.service.voice.IVoiceInteractionService$Stub$Proxy@77da1bc

$ adb shell cmd voiceinteraction show

Test: see bove
Bug: 216141085
Bug: 226201975

Merged-In: I12d9bb32e144ecf91ee4b452affea0dcea546127
Change-Id: I12d9bb32e144ecf91ee4b452affea0dcea546127
(cherry picked from commit 39acca1d72)
2022-08-03 16:03:02 +00:00