Automerger Merge Worker
5cca12a70f
Merge changes from topic "am-a2fad34aa94a482192cdf41f97562e31" into udc-dev
...
* changes:
[automerger skipped] Merge "Verify URI permissions for notification shortcutIcon." into rvc-qpr-dev am: d851a2b907 -s ours am: 2410ea829d -s ours am: 23c14c53c6 -s ours am: a8c418d17b -s ours am: 5307ceb881 -s ours am: c75c2a049c -s ours
[automerger skipped] Verify URI permissions for notification shortcutIcon. am: 01a1598047 -s ours am: d445a349f8 -s ours am: 4ef49d17f1 -s ours am: 4e045e55d0 -s ours am: 036b2e6c4f -s ours am: 5dddb5e794 -s ours
2023-05-09 18:24:33 +00:00
Ioana Alexandru
cf520c2a0e
[automerger skipped] Merge "Verify URI permissions for notification shortcutIcon." into rvc-qpr-dev am: d851a2b907 -s ours am: 2410ea829d -s ours am: 23c14c53c6 -s ours am: a8c418d17b -s ours am: 5307ceb881 -s ours am: c75c2a049c -s ours
...
am skip reason: Merged-In Iaf2a9a82f18e018e60e6cdc020da6ebf7267e8b1 with SHA-1 beb185c5cd is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/22908936
Change-Id: I3c41d630c5621f5bf0ce63f4eed4bb7754ea8baf
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-09 18:24:09 +00:00
Treehugger Robot
2b956fe212
Merge "Camera: Use characteristic from user app for extension" into udc-dev
2023-05-09 18:23:52 +00:00
Ioana Alexandru
b94380057a
[automerger skipped] Verify URI permissions for notification shortcutIcon. am: 01a1598047 -s ours am: d445a349f8 -s ours am: 4ef49d17f1 -s ours am: 4e045e55d0 -s ours am: 036b2e6c4f -s ours am: 5dddb5e794 -s ours
...
am skip reason: Merged-In Iaf2a9a82f18e018e60e6cdc020da6ebf7267e8b1 with SHA-1 beb185c5cd is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/22908936
Change-Id: I1fa3b074378a7e7ec4388f03a5eaf149cc9145e1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-09 18:23:40 +00:00
Vania Januar
d4bb41170a
Merge "Do not dismiss USI notification when stylus is bluetooth connected." into udc-dev
2023-05-09 18:13:29 +00:00
Treehugger Robot
4d1a1393fd
Merge "Use AHardwareBuffer_getAllocationSize" into udc-dev
2023-05-09 18:12:52 +00:00
Oleg Petšjonkin
d86979d3f6
Merge "Default DisplayInfo crash in getRefreshRate fix" into udc-dev
2023-05-09 18:12:21 +00:00
Treehugger Robot
cd819a4aef
Merge "Check lineHeight without cast" into udc-dev
2023-05-09 18:10:41 +00:00
Liran Binyamin
b505e9e32f
Merge "Add a field to BubbleInfo to indicate whether a bubble is important." into udc-dev am: 386848cb56
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/23038443
Change-Id: Ie9c56247d8c7e5355eac1884329a2d04bf82b380
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-09 18:09:48 +00:00
Felipe Leme
6a28d0770c
Merge "Add AdServicesManagerService to system_server_dumper" into udc-dev am: 297366d0ba
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/23006465
Change-Id: Iee67c3797bdaf8865d211089a96dfa91746b5087
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-09 18:09:11 +00:00
Treehugger Robot
4f3226dfb5
Merge "Add ability to decode only image information with ImageDecoder" into udc-dev am: c5557807e9
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/22990101
Change-Id: Ia2fcfacebe4cd7129b4216f6cc79ab8a50dda940
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-09 18:08:45 +00:00
Jiaming Liu
49f9fa83f7
Merge "Add cancel_when_requester_not_on_top to device_state print-states output" into udc-dev am: bad895ecad
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/23003311
Change-Id: I505e4040e504ca88996a590d4df35ccee0c66753
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-09 18:08:17 +00:00
Treehugger Robot
3fbd1201a3
Merge "Ignore demoteFromRunning requests if the process queue is not active." into udc-dev am: 29fd4cf2d8
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/23101286
Change-Id: Icccdc5b5d5e74cca253fa72ca77c405229d749d0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-09 18:06:20 +00:00
Jeff DeCew
9ee6d8c006
Merge "Account for the bouncer's scrim in LightBarController" into udc-dev am: b7a3e01bdf
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/23105015
Change-Id: I0f798121186e9e74c4e3ebd71286d29b87bd2c9e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-09 18:05:41 +00:00
Chavi Weingarten
64c83b4e1b
Merge "Sanitize transactions in SSG" into udc-dev am: a1b6788f68
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/22652470
Change-Id: I1dcbb585b90f9496bed9752a06456de874a70316
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-09 18:05:13 +00:00
Bryce Lee
18b647c198
Merge changes Ibe4ba52b,I0a83ce98 into udc-dev am: dd3b36ebee
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/23067596
Change-Id: If3867c59af88efce0769db10b7aead39f4d091f2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-09 18:04:06 +00:00
Liran Binyamin
386848cb56
Merge "Add a field to BubbleInfo to indicate whether a bubble is important." into udc-dev
2023-05-09 18:02:52 +00:00
Felipe Leme
297366d0ba
Merge "Add AdServicesManagerService to system_server_dumper" into udc-dev
2023-05-09 17:54:13 +00:00
Treehugger Robot
c5557807e9
Merge "Add ability to decode only image information with ImageDecoder" into udc-dev
2023-05-09 17:50:18 +00:00
Jiaming Liu
bad895ecad
Merge "Add cancel_when_requester_not_on_top to device_state print-states output" into udc-dev
2023-05-09 17:49:46 +00:00
Alejandro Nijamkin
213e2ad475
[flexiglass] Container config - UI layer.
...
The container configuration portion of the Flexiglass framework allows
OEMs to configure one or more Flexiglass containers with scenes. Each scene is a distinct bit of UI content that the
user can navigate to (for example by swiping in a direction) or that can
be navigated to automatically through the SceneInteractor methods.
Bug: 279501596
Test: Included unit tests. Manually tested through a testbed app that
uses Jetpack Compose to implement a simple UI to traverse all scenes.
Change-Id: I2c925707b0709e4aaf26bca8f94e5e2b3cf6bbcc
2023-05-09 10:45:04 -07:00
Alejandro Nijamkin
898bcd5c91
[flexiglass] Container config - domain layer.
...
The container configuration portion of the Flexiglass framework allows
OEMs to configure one or more Flexiglass containers with scenes. Each scene is a distinct bit of UI content that the
user can navigate to (for example by swiping in a direction) or that can
be navigated to automatically through the SceneInteractor methods.
Bug: 279501596
Test: Included unit tests. Manually tested through a testbed app that
uses Jetpack Compose to implement a simple UI to traverse all scenes.
Change-Id: I28708a55963ae79d48e91f2dcef06eeadea167c4
2023-05-09 10:44:53 -07:00
Alejandro Nijamkin
ceb6125169
[flexiglass] Container config - data layer.
...
The container configuration portion of the Flexiglass framework allows
OEMs to configure one or more Flexiglass containers with scenes.
Each scene is a distinct bit of UI content that the user can navigate to (for example by swiping in a direction) or that can
be navigated to automatically through the SceneInteractor methods.
Bug: 279501596
Test: Included unit tests. Manually tested through a testbed app that
uses Jetpack Compose to implement a simple UI to traverse all scenes.
Change-Id: I71bc7ea373d23312e3b4e861fa061a3cd825e938
2023-05-09 10:44:42 -07:00
Ioana Alexandru
92b4cfb6b6
[automerger skipped] Merge "Verify URI permissions for notification shortcutIcon." into rvc-dev am: eadfe8b90a -s ours am: 52922c7b14 -s ours am: a1e863a33e -s ours am: 099868aa0d -s ours am: e707b58e15 -s ours am: 2e13a4afde -s ours
...
am skip reason: Merged-In Iaf2a9a82f18e018e60e6cdc020da6ebf7267e8b1 with SHA-1 01a1598047 is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/22908034
Change-Id: I0f87fd56b97d9f90b2a423b330b2411773273664
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-09 17:43:41 +00:00
Ioana Alexandru
c05570e2b7
[automerger skipped] Verify URI permissions for notification shortcutIcon. am: 39a131783c -s ours am: aee70f1c49 -s ours am: e88eed632e -s ours am: 1d611484f9 -s ours am: 8135fa991b -s ours am: 820da584b7 -s ours
...
am skip reason: Merged-In Iaf2a9a82f18e018e60e6cdc020da6ebf7267e8b1 with SHA-1 01a1598047 is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/22908034
Change-Id: If34c3aab13936ee68ee747ed08a57ad5dbc24e39
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-09 17:43:35 +00:00
Ioana Alexandru
7e06b4b84f
[automerger skipped] Merge "Verify URI permissions for notification shortcutIcon." into rvc-qpr-dev am: d851a2b907 -s ours am: 2410ea829d -s ours am: 23c14c53c6 -s ours am: a8c418d17b -s ours am: 5307ceb881 -s ours
...
am skip reason: Merged-In Iaf2a9a82f18e018e60e6cdc020da6ebf7267e8b1 with SHA-1 beb185c5cd is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/22908936
Change-Id: I6e32a1b0a472c26702e249ee927a82c9703a751e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-09 17:43:17 +00:00
Ioana Alexandru
1aea31df53
[automerger skipped] Verify URI permissions for notification shortcutIcon. am: 01a1598047 -s ours am: d445a349f8 -s ours am: 4ef49d17f1 -s ours am: 4e045e55d0 -s ours am: 036b2e6c4f -s ours
...
am skip reason: Merged-In Iaf2a9a82f18e018e60e6cdc020da6ebf7267e8b1 with SHA-1 beb185c5cd is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/22908936
Change-Id: Ifa6a44d9f3f4cf01a46c9329cb942302bd8c7e7a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-09 17:43:11 +00:00
Ioana Alexandru
9f31dc6b58
[automerger skipped] Merge "Verify URI permissions for notification shortcutIcon." into rvc-dev am: eadfe8b90a -s ours am: 52922c7b14 -s ours am: a1e863a33e -s ours am: 099868aa0d -s ours am: e707b58e15 -s ours am: 2e13a4afde -s ours
...
am skip reason: Merged-In Iaf2a9a82f18e018e60e6cdc020da6ebf7267e8b1 with SHA-1 01a1598047 is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/22908034
Change-Id: I94b110f6e7601c71bdc3cbae8e15141d959b7eb1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-09 17:42:29 +00:00
Ioana Alexandru
62497a5f33
[automerger skipped] Verify URI permissions for notification shortcutIcon. am: 39a131783c -s ours am: aee70f1c49 -s ours am: e88eed632e -s ours am: 1d611484f9 -s ours am: 8135fa991b -s ours am: 820da584b7 -s ours
...
am skip reason: Merged-In Iaf2a9a82f18e018e60e6cdc020da6ebf7267e8b1 with SHA-1 01a1598047 is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/22908034
Change-Id: I3a45958752693f10d29fa6f3204e908b43e797e3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-09 17:42:26 +00:00
Ioana Alexandru
c75c2a049c
[automerger skipped] Merge "Verify URI permissions for notification shortcutIcon." into rvc-qpr-dev am: d851a2b907 -s ours am: 2410ea829d -s ours am: 23c14c53c6 -s ours am: a8c418d17b -s ours am: 5307ceb881 -s ours
...
am skip reason: Merged-In Iaf2a9a82f18e018e60e6cdc020da6ebf7267e8b1 with SHA-1 beb185c5cd is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/22908936
Change-Id: I2bd27117d85b7c56187c54eab502fcd1c0521a3d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-09 17:42:16 +00:00
Ioana Alexandru
5dddb5e794
[automerger skipped] Verify URI permissions for notification shortcutIcon. am: 01a1598047 -s ours am: d445a349f8 -s ours am: 4ef49d17f1 -s ours am: 4e045e55d0 -s ours am: 036b2e6c4f -s ours
...
am skip reason: Merged-In Iaf2a9a82f18e018e60e6cdc020da6ebf7267e8b1 with SHA-1 beb185c5cd is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/22908936
Change-Id: Ie1f4c4145b4fcdf5d7eaf8addfbd49deed8aac77
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-09 17:42:06 +00:00
Treehugger Robot
29fd4cf2d8
Merge "Ignore demoteFromRunning requests if the process queue is not active." into udc-dev
2023-05-09 17:41:58 +00:00
Anthony Alridge
39e62e9440
Use mini-resolver instead of alert dialog for dialer work telephony
...
We previously showed an alert dialog when redirecting the user to the
work profile due to telephony being unavailable. This resulted in some
inconsistent UIs, with the user sometimes seing the mini-resolver,
sometimes seeing this dialog depending on what journey they use
to make a phone call. This CL introduces consistency for the call
case by redirecting to the intent forwarder when the user
attempts to make a call in the primary profile, with telephony only
available in the work profile.
The previous dialog is modified to handle the error case when there
is no dialer app to switch to in work, directing the user to install
an app instead.
A follow-up CL will address the case of ensuring messages show the
mini-resolver.
Tested manually, screenshots show that the mini-resolver is shown
for both text and call in contacts app (previously calls would show
the dialog).
Bug: 271819927
Test: Manually, see screenshots in bug
Change-Id: I98df65ab0a4a8acea41f2dc9581a07452f324539
2023-05-09 17:41:18 +00:00
Jeff DeCew
b7a3e01bdf
Merge "Account for the bouncer's scrim in LightBarController" into udc-dev
2023-05-09 17:37:01 +00:00
Chavi Weingarten
a1b6788f68
Merge "Sanitize transactions in SSG" into udc-dev
2023-05-09 17:36:31 +00:00
Bryce Lee
dd3b36ebee
Merge changes Ibe4ba52b,I0a83ce98 into udc-dev
...
* changes:
Handle overlay edge spacing within individual complications layouts.
Move directional spacing logic out of ViewEntry.
2023-05-09 17:36:00 +00:00
Jeff DeCew
6fcf0eb913
Use android.icu.text.SimpleDateFormat to speed up LogBuffer dumping
...
Fixes: 281693061
Test: dumpsysui buffers
Change-Id: I5e00bbb78ef8a0d14fc813afb9fb17950f743618
2023-05-09 13:32:17 -04:00
Shawn Lee
f9cd87cb0f
Merge "Prevent NPE in NPVC when accessing HeadsUpAppearanceController" into udc-dev am: 4ccef5d179
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/23091745
Change-Id: I42c66d21c7dd232777ca394c29be75d5ccdef306
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-09 17:29:11 +00:00
Arun kumar Voddu
c032ef6c8b
Merge "New hidden API to support the CTS test case that checks the file contents remains unaltered." into udc-dev am: 0fa26314fe
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/22839500
Change-Id: Iea911ff600d1118940b713d6c72ab33098f01f87
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-09 17:28:39 +00:00
Nicolò Mazzucato
26fc7e1963
Merge "Change unfold background color based on split screen state" into udc-dev am: 550f35fcdb
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/23083218
Change-Id: I3374a35e092d91d6272d1935ddf4a185bfd55c1c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-09 17:27:49 +00:00
Guojing Yuan
d578b89424
Merge "[ContextSync] Disable ContextSync flag by default" into udc-dev am: 641d66ba66
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/23091642
Change-Id: I1cdde6445e5ddb1c5218c34cb9437fc3c61083da
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-09 17:27:18 +00:00
Shawn Lee
4ccef5d179
Merge "Prevent NPE in NPVC when accessing HeadsUpAppearanceController" into udc-dev
2023-05-09 17:26:34 +00:00
Atneya Nair
b14466d3a3
Merge "Add AppOps listening to STService" into udc-dev am: 3d360a0e49
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/22994597
Change-Id: Ie69a3a48442c99a033531403d08a2166cba57c31
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-09 17:26:32 +00:00
Arun kumar Voddu
0fa26314fe
Merge "New hidden API to support the CTS test case that checks the file contents remains unaltered." into udc-dev
2023-05-09 17:24:38 +00:00
Helen Qin
fb8f80b3ef
Merge "Handle empty auth entry title" into udc-dev am: 60ef9de138
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/23103169
Change-Id: I3a76d6da483ab6bd16b05dc3fe3d5d349890b954
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-09 17:24:04 +00:00
Antony Sargent
62280d26ff
Skip clipboard access toasts for VirtualDevice owner app
...
When the privileged app which owns a VirtualDevice reads the siloed
clipboard reserved for that VirtualDevice, don't show a toast.
Bug: 276507183
Test: atest StreamedAppClipboardToast
Change-Id: I5d228191e58306980ca77940792e0dda9f1bc875
2023-05-09 17:23:33 +00:00
Treehugger Robot
cb7f8c1120
Merge "Only honor preferUiBrandingComponentName with permission" into udc-dev am: b6699962a2
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/23102617
Change-Id: Ibbcbfd81a8ac47de58691980a3fd1ba07299ff7f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-09 17:23:28 +00:00
TreeHugger Robot
4ae96c6a7d
Merge "Unlocked empty auth entry shouldn't be clickable anymore" into udc-dev am: 02416e1589
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/23104897
Change-Id: I1a6f13817f1c687a394495b347057b8d383fbbe0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-09 17:23:05 +00:00
Treehugger Robot
142883f529
Merge "Handle empty action entry subtitle" into udc-dev am: 5756c96508
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/23104451
Change-Id: Ic59b658413b1c8269a6d4f17f272fc36904dc2e5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-09 17:22:37 +00:00
Beverly Tai
de2b45ebe2
Merge "On device lockdown, always show the keyguard" into udc-dev am: 5349dd72fb
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/23088548
Change-Id: I48a973b17fc40948ecaafdc13f732d07dfd81c86
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-09 17:22:14 +00:00