Atneya Nair
c27813ebbc
Merge "Fix potential NPE in STHelper" into udc-dev
2023-05-09 15:58:25 +00:00
Beverly
7b5c78d4a5
Dismiss the keyguard through #notifyKeyguardAuthentiated
...
In case a pending dismiss action exists when dreaming.
Update integration test
Test: manually launch an intent from dreaming and authenticate
through the alternate bouncer => see intent gets triggered
after authentication
Test: atest KeyguardViewMediatorTest
Fixes: 277284836
Change-Id: Ib67e2e0d9b7c1d59921c13d21e307c2292bd261b
2023-05-09 15:56:43 +00:00
Vania Januar
be92318d56
Do not dismiss USI notification when stylus is bluetooth connected.
...
Test: StylusUsiPowerUiTest, StylusUsiPowerStartableTest
Bug: 280444475
Change-Id: I8642c1b98c1e6f5d67ccdd7c956963afe2145672
2023-05-09 16:45:55 +01:00
Aaron Liu
c3107007fc
Merge "Merge "Maintain parity with central surfaces impl." into udc-dev am: f3192865a3" into udc-mainline-prod
2023-05-09 15:39:52 +00:00
Dmitry Dementyev
547d5bbecd
Merge "Remove unnecessary flag check from RecoverableKeystoreDb." into udc-dev am: 76e2a5a109
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/22831222
Change-Id: I9558c243207f991abddf60920df51dc04240a017
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-09 15:38:49 +00:00
Chavi Weingarten
1c465b99fe
Merge "Only prevent overlapping SSG if a buffer is going to be synced" into udc-dev am: 2fa848da82
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/23085297
Change-Id: Ic70fb4fd6450b65090089714f7ae38cf7ddaab5a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-09 15:38:16 +00:00
Niamh Walsh
4f38ca9839
Merge "Add restore logging to WallpaperBackupAgent" into udc-dev am: a674bc920e
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/22762142
Change-Id: If6e77cb60aac0f15e6464c0799f63db7773afe05
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-09 15:37:42 +00:00
Ioana Alexandru
099868aa0d
[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 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: Ied7540183a8cf95668c1f0c73ceedef52ed5a9de
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-09 15:36:45 +00:00
Ioana Alexandru
1d611484f9
[automerger skipped] Verify URI permissions for notification shortcutIcon. am: 39a131783c -s ours am: aee70f1c49 -s ours am: e88eed632e -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: Ie52a66773e104439db5d46129dccbd5d90347c1e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-09 15:36:42 +00:00
Treehugger Robot
8cc9594f23
Merge "Fix minor issues." into udc-dev am: 756143de48
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/23102679
Change-Id: I965ea1ac34b83223cd159312a2c815b151f49ec4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-09 15:36:33 +00:00
Ioana Alexandru
23c14c53c6
[automerger skipped] Merge "Verify URI permissions for notification shortcutIcon." into rvc-qpr-dev am: d851a2b907 -s ours am: 2410ea829d -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: Iaf6ee209a1e722a5a92b71d6ac23dc9b4014699d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-09 15:36:30 +00:00
Ioana Alexandru
4ef49d17f1
[automerger skipped] Verify URI permissions for notification shortcutIcon. am: 01a1598047 -s ours am: d445a349f8 -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: I83a431fa4ccc50e996e980af10b9a28040dea925
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-09 15:36:27 +00:00
Dmitry Dementyev
76e2a5a109
Merge "Remove unnecessary flag check from RecoverableKeystoreDb." into udc-dev
2023-05-09 15:36:10 +00:00
Chavi Weingarten
2fa848da82
Merge "Only prevent overlapping SSG if a buffer is going to be synced" into udc-dev
2023-05-09 15:29:03 +00:00
Chavi Weingarten
5a1eab34fc
Only prevent overlapping SSG if a buffer is going to be synced
...
In VRI, SSG are sometimes created as a way to notify WMS that a buffer
has been drawn and not always to sync the buffer. In those cases,
there's no need to prevent overlapping syncs since the buffers cannot be
submitted out of order. Only add the safeguard SSG when there's a buffer
getting synced to ensure multiple buffer syncs for the same VRI are
submitted in order.
Test: SurfaceSyncGroupTests SurfaceSyncGroupTest
Bug: 279096620
Bug: 279790175
Change-Id: I77841296297717e413237c183738b9ec9642f1cf
2023-05-09 15:28:13 +00:00
Haoyu Zhang
fa242f4a93
Introduce handwriting hover icon and update its hide/show logic
...
Updated the hover icon for PointerIcon.TYPE_HANDWRITING. And also
updated the hide/show logic of the handwriting hover icon.
By default handwriting hover icon is displayed for areas where
handwriting is available.
Now the hover icon will hide after handwriting is triggered on the
active editor until one of the following events happens:
a) stylus clicks something.
b) stylus hovers on another editor that supports handwriting.
c) the current focused editor lost focus.
The hotspot of the pointer icon is designed to be
x: 34% of the width; 8.25 dp (rouneded to the closest quarter-dp).
y: 100% of height, which is set to 23.75dp because
hotSpotY must be less than bitmap height.
Bug: 274696514
Test: atest HandwritingInitiatorTest
Change-Id: I9270076fc3f5eae78386fb5c2e15f9872ddf0c40
2023-05-09 08:28:09 -07:00
Ruslan Tkhakokhov
2d45bd5397
Clear calling identity n BackupManager#reportDelayedRestoreResult
...
The method binds BackupTransport, which needs to happen from system
process.
Bug: 280047012
Test: 1. Modify TelephonyBackupAgent to call
BackupManager#reportDelayedRestoreResult
2. Observe there's no exception.
Change-Id: I84ee31fa7d08f1f4714e303c33e64ed61503c452
2023-05-09 15:25:49 +00:00
Niamh Walsh
a674bc920e
Merge "Add restore logging to WallpaperBackupAgent" into udc-dev
2023-05-09 15:22:09 +00:00
Sudheer Shanka
6da3c3bc0d
Ignore demoteFromRunning requests if the process queue is not active.
...
Bug: 281662943
Test: atest services/tests/mockingservicestests/src/com/android/server/am/BroadcastQueueTest.java
Test: atest services/tests/mockingservicestests/src/com/android/server/am/BroadcastQueueModernImplTest.java
Change-Id: Id2e223a3e523142fbb9bc23a533ba3e0fa8d4982
2023-05-09 08:19:09 -07:00
Treehugger Robot
756143de48
Merge "Fix minor issues." into udc-dev
2023-05-09 15:08:41 +00:00
Fabian Kozynski
7589dd22fd
Merge "Add logging when tile cannot be found" into udc-dev am: 53466c0060
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/23087975
Change-Id: Ief47cc09cd2258a64ba96a7465cb662a9c0be8ec
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-09 14:57:22 +00:00
Anthony Alridge
de7c62d3f4
Merge "Update strings for mini-resolver views" into udc-dev am: 829775a61b
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/23028637
Change-Id: Iafae043b85b177fab9522619bd783743de47343a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-09 14:56:47 +00:00
Evan Laird
3bee7cb068
Merge changes If2d87039,Ia544cbbf into udc-dev am: cadaf0c52e
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/23033485
Change-Id: I24562a816acefb238ead9e44fe5f9b5ef0fe4dd8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-09 14:55:55 +00:00
Fabian Kozynski
53466c0060
Merge "Add logging when tile cannot be found" into udc-dev
2023-05-09 14:55:46 +00:00
Matías Hernández
85d7debe1c
Merge "Add a comprehensive test for Notification.visitUris()" into udc-dev am: 353e15b09e
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/23049101
Change-Id: I9c8c28d80cdb92b2d8fafc39b21e8ba76a55edf4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-09 14:54:20 +00:00
Ioana Alexandru
a1e863a33e
[automerger skipped] Merge "Verify URI permissions for notification shortcutIcon." into rvc-dev am: eadfe8b90a -s ours am: 52922c7b14 -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: I37d70ae9fba0c04093d522376e99ea14db735b95
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-09 14:54:03 +00:00
Ioana Alexandru
e88eed632e
[automerger skipped] Verify URI permissions for notification shortcutIcon. am: 39a131783c -s ours am: aee70f1c49 -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: Ibe90154de90c54a933cbfc68fb4914965478ccc1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-09 14:53:52 +00:00
TreeHugger Robot
5599e1ed0a
Merge "Count quiet mode as "off" for max time off policy" into udc-dev am: ff1e986e40
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/22994460
Change-Id: Ib78c03347ef4d541f83a57702bd03e9879f70dfa
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-09 14:53:33 +00:00
Ioana Alexandru
2410ea829d
[automerger skipped] Merge "Verify URI permissions for notification shortcutIcon." into rvc-qpr-dev am: d851a2b907 -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: Ib3542e15e838ced217cbfa16fe667996462626d4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-09 14:53:30 +00:00
Ioana Alexandru
d445a349f8
[automerger skipped] Verify URI permissions for notification shortcutIcon. am: 01a1598047 -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: I953675395780c57526c2c9288aa8da696b59e45d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-09 14:53:19 +00:00
Prabir Pradhan
bc48ff4c76
Merge changes I58a9c06b,I08bedeca into udc-dev am: 83f861dc13
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/22896325
Change-Id: I176f7d8ef35c4ed6e77aeb13489ec9e0393b64e7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-09 14:52:28 +00:00
Anthony Alridge
829775a61b
Merge "Update strings for mini-resolver views" into udc-dev
2023-05-09 14:51:12 +00:00
Ioana Alexandru
52922c7b14
[automerger skipped] Merge "Verify URI permissions for notification shortcutIcon." into rvc-dev am: eadfe8b90a -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: Idf703a113f451c2b208db9801a4544bbab8883ad
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-09 14:50:22 +00:00
Ioana Alexandru
aee70f1c49
[automerger skipped] Verify URI permissions for notification shortcutIcon. am: 39a131783c -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: I4576def02609d6829294c8ce7faac7593d30677f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-09 14:50:19 +00:00
Oleg Petsjonkin
f002ebd14c
Default DisplayInfo crash in getRefreshRate fix
...
Bug: b/280011735
Test: atest DisplayInfoTest
Change-Id: I27752a5ddcee3f1c297c8f64a99098bbb4ae0c3b
2023-05-09 14:39:51 +00:00
Evan Laird
cadaf0c52e
Merge changes If2d87039,Ia544cbbf into udc-dev
...
* changes:
Add @SysUISingleton to repository switcher classes
Carrier text: add LogBuffer debug logs
2023-05-09 14:32:16 +00:00
Matías Hernández
353e15b09e
Merge "Add a comprehensive test for Notification.visitUris()" into udc-dev
2023-05-09 14:30:27 +00:00
TreeHugger Robot
ff1e986e40
Merge "Count quiet mode as "off" for max time off policy" into udc-dev
2023-05-09 14:24:59 +00:00
Ioana Alexandru
eadfe8b90a
Merge "Verify URI permissions for notification shortcutIcon." into rvc-dev
2023-05-09 14:16:49 +00:00
Ioana Alexandru
d851a2b907
Merge "Verify URI permissions for notification shortcutIcon." into rvc-qpr-dev
2023-05-09 14:16:32 +00:00
Prabir Pradhan
83f861dc13
Merge changes I58a9c06b,I08bedeca into udc-dev
...
* changes:
ViewGroup: Send events to the child at the event's dispatch location
Create FocusEventDebugView to show key presses on screen
2023-05-09 14:12:50 +00:00
Beverly
97bdc29480
Move toTriple/Quad/Quint methods to a Utils class
...
Bug: 278719514
Test: atest KeyguardTransitionScenariosTest
Change-Id: I8720d8f97269994d2c6c934fd9b61f5d30506b57
2023-05-09 13:51:48 +00:00
Jeff DeCew
5f9795ecdd
Merge "Remove ShadeViewRefactor annotation and uses" into udc-dev am: cd142ed841
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/23062856
Change-Id: I69295f228fb5b2c398913475cc432d65924f827c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-09 13:26:06 +00:00
Caitlin Shkuratov
b8633aa4e1
Merge "[Status bar] Delay showing the status bar during dream transition." into udc-dev am: e0ff509876
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/23087081
Change-Id: If2d1ebc7c2ea55c87c3b47c9c702d375585d9be4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-09 13:25:36 +00:00
Automerger Merge Worker
27006d601d
Merge "Merge "Verify URI permissions for notification shortcutIcon." into sc-dev am: 10ce511ed9 am: 2f2f8155b2 am: d07bdb1979 am: 82fb81741a am: 063800db34 am: 2073ca0a96" into udc-dev am: c271d30bf4
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/22894946
Change-Id: Ib3a94a462eee687dfebef513cef31450fef0fbf3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-09 13:25:09 +00:00
Automerger Merge Worker
5ed0e760de
Merge "Merge "Verify URI permissions for notification shortcutIcon." into sc-dev am: 10ce511ed9 am: 2f2f8155b2 am: d07bdb1979 am: 82fb81741a am: 063800db34 am: 2073ca0a96" into udc-dev am: f1de85abc8
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/22894946
Change-Id: Ia29d1a5a473d13d0b72065d87f6088de820a06ef
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-09 13:23:06 +00:00
Sam Dubey
4fc4e466da
Merge "Revert "Dismiss the keyguard through #notifyKeyguardAuthentiated"" into udc-dev am: 4a7a8cdc6d
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/23104525
Change-Id: I2d1faaa4501022b5919002c3a4bbdefd40a46f82
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-09 13:22:43 +00:00
Ioana Alexandru
7cca89b2e7
Merge "Verify URI permissions for notification shortcutIcon." into sc-dev am: 10ce511ed9 am: 2f2f8155b2 am: d07bdb1979 am: 82fb81741a am: a31dc75316 am: b93c28875c
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/22894946
Change-Id: I2de8047e6afd6667861434c124d5ae0a380cabb5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-09 13:22:29 +00:00
Ioana Alexandru
85212a353f
Merge changes from topic "presubmit-am-b58a01f1adec4c46ae37d132031c6dc4" into sc-qpr1-dev am: 7588315470 am: 3151caeedd am: a4cd210406 am: b8098faee7 am: 7d0402f17e
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/22894946
Change-Id: Ib45fc1b7ab00127448303f95ff32c12e23e77924
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-09 13:22:19 +00:00
Jeff DeCew
cd142ed841
Merge "Remove ShadeViewRefactor annotation and uses" into udc-dev
2023-05-09 13:22:02 +00:00