Commit Graph

891995 Commits

Author SHA1 Message Date
Atneya Nair
57f998f67f Remove SoundTriggerService stopping state am: 70b1371bbc
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/22799239

Change-Id: I0df4961739d837b91bf47a2b127e13791ca0a739
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-04 23:46:01 +00:00
Atneya Nair
c980048d0c Revert "Generate an abort event when stopping" am: c4a891c6bc
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/22787398

Change-Id: Iae2126fc4d872b0c7a137237f3b856f9397e16b8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-04 23:45:56 +00:00
Treehugger Robot
e211747e77 Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-mainline-prod 2023-05-04 23:45:44 +00:00
Treehugger Robot
d7025ed8cf Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-mainline-prod 2023-05-04 23:45:28 +00:00
Alex Buynytskyy
48bb565885 Minor refactor to make HACK easier to apply.
Bug: 275409981
Test: atest com.android.server.pm.parsing.PackageParserLegacyCoreTest
Change-Id: If37d676c2e3f68e758864f1ee3db5b740e48d1a2
2023-05-04 23:44:08 +00:00
TreeHugger Robot
d4cc22c985 Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-mainline-prod 2023-05-04 23:43:51 +00:00
Songchun Fan
2e278e384c [pm] fix ConcurrentModificationException in AppsFilter
BUG: 275518570
Test: atest com.android.server.pm.AppsFilterImplTest
Test: atest CtsAppEnumerationTestCases
Change-Id: If40cf191fae12ae13633f4212c774bb277094520
2023-05-04 23:41:57 +00:00
Liana Kazanova
6fc38dc1e4 Merge "Revert "Fix weather clock clipped when swiping in Lockscreen"" into udc-dev am: 7fa9ecf247
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/23043906

Change-Id: I6039e03eda5adf902e19c9f8e2f315c62f5bb676
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-04 23:39:08 +00:00
Atneya Nair
9e6c6ca843 Merge changes from topic "st_stopping" into udc-dev
* changes:
  Add recognition session tokens
  Remove SoundTriggerService stopping state
  Revert "Generate an abort event when stopping"
2023-05-04 23:33:56 +00:00
TreeHugger Robot
89762dee23 Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-mainline-prod 2023-05-04 23:33:52 +00:00
Helen Qin
465b407923 Remove unwanted separator bar when description is empty
Bug: 280887017
Test: manual (see bug for screenshots)
Change-Id: I2efc07521de521ccd12484dc3dcb448778c834a9
2023-05-04 23:31:12 +00:00
Liana Kazanova
7fa9ecf247 Merge "Revert "Fix weather clock clipped when swiping in Lockscreen"" into udc-dev 2023-05-04 23:25:51 +00:00
Treehugger Robot
75f0ad75da Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-mainline-prod 2023-05-04 23:24:08 +00:00
Massimo Carli
52b46fe554 Merge "Improve first opaque activity candidate detection" into udc-dev am: 3d8f16685e
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/22885818

Change-Id: I9e922d14c77f90ee335ae5f70ef8b4cf20e284c1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-04 23:18:44 +00:00
Matt Sziklay
2d59c00d0e Merge "Make resize veil background adapt to theme." into udc-dev am: 2ce7451ad2
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/22912989

Change-Id: I50b0e72cb0af62c60b2c3243a80a77b4382d2edf
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-04 23:16:54 +00:00
Massimo Carli
3d8f16685e Merge "Improve first opaque activity candidate detection" into udc-dev 2023-05-04 23:12:43 +00:00
Austin Borger
92577efba3 Merge "ActivityManagerService: Allow openContentUri from vendor/system/product." into sc-dev 2023-05-04 23:11:16 +00:00
Austin Borger
214ad884c6 Merge changes from topic "presubmit-am-cb3c43babe4c45069e5619a744950e15" into sc-qpr1-dev
* changes:
  [automerge] ActivityManagerService: Allow openContentUri from vendor/system/product. 2p: e37820e47c
  ActivityManagerService: Allow openContentUri from vendor/system/product.
2023-05-04 23:11:16 +00:00
Matt Sziklay
2ce7451ad2 Merge "Make resize veil background adapt to theme." into udc-dev 2023-05-04 23:06:32 +00:00
Ikram Gabiyev
7ab71314a5 Merge "Remove logs since PipPinchInTest is fixed" into udc-dev am: 8f85ec1e56
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/23039781

Change-Id: I81e75471518c652a020e1a1ff4688d6ad829b764
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-04 23:01:00 +00:00
Shawn Lee
409244db27 Merge "Adding logging for expansion state during unlock transition" into udc-dev am: 13cebac1c8
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/23003108

Change-Id: I831d6e0df388450165cb4cfde1cd76e2a57d4e03
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-04 22:59:39 +00:00
shubang
ea3dee1073 [TIAF] Fix FD leak in AdBuffer
And add metadata keys.

Bug: 280886498
Test: atest TvInteractiveAppServiceTest#testNotifyAdBufferReady
Change-Id: Ib72139a80a671c6990e5fda1ccb6508ce2129155
2023-05-04 15:59:04 -07:00
Treehugger Robot
a5c4dcc873 Merge "Add a title to BubbleInfo." into udc-dev am: 75bb6efbd1
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/23004018

Change-Id: I99fe75b802d5442823c5790fdbdeec03f59d83e0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-04 22:56:23 +00:00
Derek Jedral
6241b77464 Report correct userId in onUserMayRequestUnlock.
obtainMessage with two arguments will set the user id as the object, but
this value is retrieved as msg.arg1. We need to call obtainMessage with
three arguments instead to make the second argument the userId. Thir
third argument will be ignored by the receiver.

Test: atest TrustTests:UserUnlockRequestTest
Bug: b/278323473
Change-Id: Ie08c643f9fb5fbbe7f107a1f267074805ddc500b
2023-05-04 15:53:27 -07:00
Ikram Gabiyev
8f85ec1e56 Merge "Remove logs since PipPinchInTest is fixed" into udc-dev 2023-05-04 22:47:12 +00:00
Mariia Sandrikova
7bcc1fe392 Clean up a flag for respecting nosensor and locked when docked.
Removing config that was originally added in Ibb017523d7c99174cf5f20e8fbb89a726aa18e15 enabling the corresponding behavior by default.

Fix: 274763533
Test: atest WmTests:DisplayRotationTests
Change-Id: Ie9cef1971b377eaf34eb2a3ec32d1f473533b56a
2023-05-04 23:44:08 +01:00
Antonio Kantek
a6b481a7d2 Return the default touch mode for dead displays
Certain race conditions may lead to client code trying to manipulate
(like adding an window) an already gone virtual display. This CL changes
WMS#isInTouchMode to return the default touch mode in case the display
passed as argument is already gone.

Fix: 280671905
Test: atest FrameworksCoreTests
Test: atest WmTests:WindowManagerServiceTests
Test: atest CtsInputTestCases:android.input.cts.TouchModeTest
Change-Id: Iea61f82ec1945ba0b65ce8af4896b5fb9923af6e
2023-05-04 22:42:27 +00:00
Shawn Lee
13cebac1c8 Merge "Adding logging for expansion state during unlock transition" into udc-dev 2023-05-04 22:35:17 +00:00
Treehugger Robot
75bb6efbd1 Merge "Add a title to BubbleInfo." into udc-dev 2023-05-04 22:28:26 +00:00
Liana Kazanova
ba8a72c5ec Revert "Fix weather clock clipped when swiping in Lockscreen"
This reverts commit e40e3268e1.

Reason for revert: b/280863001

Change-Id: I1920bb2c679899eff6f3ed10983380671c660997
2023-05-04 22:16:43 +00:00
Antonio Kantek
0ba977d4ad Fix WindowManagerServiceTests touch tests
WMS#setInTouchMode no longer read
`com.android.internal.R.bool.config_perDisplayFocusEnabled` from
context. Now it reads from mPerDisplayFocusEnabled, so mocking context
and resources won't work.

Bug: 280671905
Test: atest WmTests:WindowManagerServiceTests
Change-Id: I4aaa9f8ee83d173f27ff72b3f0bc1a689426706a
2023-05-04 22:14:08 +00:00
Treehugger Robot
9caecbdad8 Merge "Use static initializer for CUJ mapping" into udc-dev am: fad846b3e6
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/23003898

Change-Id: Ib78092c1864e1b749c0c30a00c04c5a194f2a38f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-04 22:12:11 +00:00
Treehugger Robot
fad846b3e6 Merge "Use static initializer for CUJ mapping" into udc-dev 2023-05-04 22:11:31 +00:00
TreeHugger Robot
d717e399d8 [automerger skipped] Merge changes from topic "cherrypick-checkSessionParams-ixtl2uw7uua" into tm-qpr-dev am: 6759c17307 -s ours am: 4d296bf74a -s ours
am skip reason: Merged-In Ib2af1afc78b3d9c6d8eb534e5f536aae153eeeb0 with SHA-1 ec8328db81 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/22976593

Change-Id: I4ab1babb85af6ac21a755445d7f27ab85550bdcd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-04 22:10:43 +00:00
Alex Buynytskyy
945eb96be9 [automerger skipped] [RESTRICT AUTOMERGE] Null is a valid volume uuid. am: 3fae7a0c6a -s ours am: b36856f81a -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/22976593

Change-Id: I57b8c3f83d921fdbf03fb91d0007807f2ec5fd46
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-04 22:10:31 +00:00
TreeHugger Robot
4d296bf74a [automerger skipped] Merge changes from topic "cherrypick-checkSessionParams-ixtl2uw7uua" into tm-qpr-dev am: 6759c17307 -s ours
am skip reason: Merged-In Ib2af1afc78b3d9c6d8eb534e5f536aae153eeeb0 with SHA-1 ec8328db81 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/22976593

Change-Id: I344a1e42da0ca087e82dbf3c895a0cdd78155ca9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-04 21:48:57 +00:00
Alex Buynytskyy
b36856f81a [automerger skipped] [RESTRICT AUTOMERGE] Null is a valid volume uuid. am: 3fae7a0c6a -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/22976593

Change-Id: I917185f9adf97bea60d84523a6955ddfcbaf21a7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-04 21:48:42 +00:00
Nate Myren
e1825fcda3 Correct SensorPrivacyState if needed, prevent state from going bad
If a device doesn't support sensor privacy, it should not be allowed to
enable it. If it has been enabled, disable it.

Bug: 280005257
Fixes: 280878138
Test: atestSensorPrivacyCameraTest
Change-Id: Ic68f61624ae427682f3636ed1717f492d6f484ab
2023-05-04 21:46:06 +00:00
Guangjie (Jerry) Shi
ba2dd86dae Merge "Set the primary provider list to UI" into udc-dev am: 6bcbecdd34
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/23016277

Change-Id: Id81c14cb6e9fcf1489395f8ad56b627633295426
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-04 21:29:42 +00:00
Treehugger Robot
4e054b4c2c Merge "Attempt to unlink session file if hardlink fails" into udc-dev am: 7fbed032f6
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/22959449

Change-Id: Iec4a32ea7f2a0be9c605e6eb1ff16ac596bc8d55
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-04 21:28:33 +00:00
Treehugger Robot
0a23bda20b Merge "Do a null check before returning the primary providers" into udc-dev am: cc87e369b8
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/23035616

Change-Id: Idb31405ba367e323815c83a07bb4c37c8f7b90fa
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-04 21:26:26 +00:00
Guangjie (Jerry) Shi
6bcbecdd34 Merge "Set the primary provider list to UI" into udc-dev 2023-05-04 21:21:57 +00:00
Treehugger Robot
7fbed032f6 Merge "Attempt to unlink session file if hardlink fails" into udc-dev 2023-05-04 21:12:04 +00:00
Treehugger Robot
cc87e369b8 Merge "Do a null check before returning the primary providers" into udc-dev 2023-05-04 21:08:43 +00:00
Ikram Gabiyev
4212f8968b Remove logs since PipPinchInTest is fixed
Remove the logs that were added to help debug PipPinchInTest
since it passes now.

Bug: 270984004
Test: atest WMShellFlickerTests:PipPinchInTest
Merged-In: I11cc57f2af1ef4330dcfa89497214ebeac1ca463
Change-Id: If7640e15a3e80e81ecf9387db5c4d555021e1d6a
2023-05-04 14:06:05 -07:00
TreeHugger Robot
6759c17307 Merge changes from topic "cherrypick-checkSessionParams-ixtl2uw7uua" into tm-qpr-dev
* changes:
  [RESTRICT AUTOMERGE] Null is a valid volume uuid.
  [RESTRICT AUTOMERGE] Add a debug workaround for the tests.
2023-05-04 21:04:38 +00:00
Matt Buckley
1e06be0b46 Merge "Create hint session asynchronously" into udc-dev am: 5c406a3cad
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/22951911

Change-Id: I9e4c436fb0c962d967f3370f0db77938e5b75493
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-04 20:53:53 +00:00
Song Chun Fan
caeb19048d Revert "Revert "[SettingsProvider] skip caching in system server""
This reverts commit 0f69f74962.

Reason for revert: reland without DeviceConfig changes

BUG: 277448672
Test: atest android.accessibilityservice.cts.AccessibilityTextTraversalTest#testTextEditingAction
Change-Id: Ib02120028a3ea0a6e73041262096f0921d6f1cfc
2023-05-04 13:52:09 -07:00
Dmitri Plotnikov
5f550dc616 Improve logic around battery history time base
Bug: 280079024
Test: atest FrameworksCoreTests FrameworksServicesTests
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:707dcfb6b4e715e7e1d8e4d4b3e98e837b4d203d)
Merged-In: Iea5e3305f1bdc3e3fa6cb2a0d05082206aeae03c
Change-Id: Iea5e3305f1bdc3e3fa6cb2a0d05082206aeae03c
2023-05-04 20:48:28 +00:00
Mady Mellor
81adc99ed5 Merge "Calculate the launch bounds after layout" into udc-dev am: a034b4741d
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/23007701

Change-Id: I0fb2ab32df62dafda6be8848dcc574b8ed30412a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-04 20:46:22 +00:00