Jay Aliomer
|
0dbaf445c9
|
Merge "Reset patterned animations when solid ripple is reset" into sc-dev am: 70c0c93542 am: da8be68189
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15413252
Change-Id: Iab3fa2527f759990a99e412384c99680e7003cac
|
2021-07-30 01:04:28 +00:00 |
|
Michael Wachenschwanz
|
6013a12ae7
|
Merge "Log and skip noteEvent calls with null name" into sc-dev am: 0e1ba5a342 am: b4db3d2505
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15419007
Change-Id: I9c1ecdd932cfa37aa3b64c929a028927c16112c0
|
2021-07-30 01:04:02 +00:00 |
|
Beverly Tai
|
4766c92074
|
Merge "Add gravity center to layout params" into sc-dev am: 98a4967908 am: a1089252cd
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15411507
Change-Id: I8a9879eb999e1a26b8e30120d7241961f0cc6a93
|
2021-07-30 01:03:00 +00:00 |
|
Jeff DeCew
|
8d801f602e
|
Merge "Fix bug removing semantic colors of CallStyle notification actions." into sc-dev am: 4203db854f am: 8f8facbbbc
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15405173
Change-Id: I606009fbb0d6ec958dfe599224c104e78ee62cb5
|
2021-07-30 01:02:06 +00:00 |
|
Beverly Tai
|
f606f354b4
|
Merge "For devices with udfps, always show bg on udfps" into sc-dev am: d2e60974cb am: 7e67690b82
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15392265
Change-Id: I914b9d91974ba6a49ba865e7e41d4a37626f5730
|
2021-07-30 01:01:30 +00:00 |
|
Nate Myren
|
c87b50ae0a
|
Merge "Add |role to UPDATE_APP_OPS_STATS" into sc-dev am: 71a8968dcb am: 5d6791f0c6
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15341655
Change-Id: Iaea3acd1419274efd10ef5b29ef5801f60867396
|
2021-07-30 01:00:58 +00:00 |
|
Prabir Pradhan
|
d79291a7a7
|
Merge "InputManagerService: Do not remove input channel when disposing monitor" into sc-dev am: 2f13cca5a6 am: dba3350087
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15405649
Change-Id: I7ae533daaf4cac278a8a30935ccd144744b4d54b
|
2021-07-30 01:00:39 +00:00 |
|
Songchun Fan
|
3edc8de2ce
|
Merge "[pm] ignore partial progress update after off-incfs migration" into sc-dev am: 5ba5f1392f am: 3f47f90e0c
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15405281
Change-Id: I7f9563d2e08de5d35ca41c82eec7053f2fdef9d6
|
2021-07-30 01:00:20 +00:00 |
|
Matt Pietal
|
c3bbd9efeb
|
Merge "Make sure SIM PIN screen shows" into sc-dev am: c3915dcbe9 am: a313bcd14b
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15409421
Change-Id: Ib70441b1456b7c96d59125755631dbaee68fcc54
|
2021-07-30 00:59:46 +00:00 |
|
Beverly Tai
|
afeaa16749
|
Merge "Rescan face when user preses empty space on LS" into sc-dev am: 866753754b am: fe3a59a636
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15412658
Change-Id: I8a210e57c2b410e416b2f260c94ad3080a8bc38f
|
2021-07-30 00:59:17 +00:00 |
|
Beverly Tai
|
eca35441b0
|
Merge "Don't setDeviceEntryIntent on AOD" into sc-dev am: 11f74e42a5 am: cb50fcf99b
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15412657
Change-Id: I37956e4bbf99ae21965bda492f06652efc8e9f2e
|
2021-07-30 00:58:38 +00:00 |
|
Fiona Campbell
|
7e6cf83049
|
Merge "Null check for logicaldisplay" into sc-dev am: fca58882db am: 3030b865bb
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15403077
Change-Id: I304b93eee0c9332ab302c59cdcd43221af1a2751
|
2021-07-30 00:57:46 +00:00 |
|
Jing Ji
|
178cf6cdc8
|
Merge "Fix NullPointerException in PhantomProcessList due to race condition" into sc-dev am: 8b872f5c71 am: 357769d696
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15404738
Change-Id: I5825ccd13fce8ddcbc7bd9eec3fb03bfcc16dc41
|
2021-07-30 00:57:21 +00:00 |
|
TreeHugger Robot
|
56ab766d76
|
[automerger skipped] Merge "Disable inline suggestions for afservice when talkback is enabled." into sc-dev am: fda724a5be am: ad5545d354 -s ours
am skip reason: Merged-In Ifb37ac2a164a4564b74c6ab80a0c31fbba3495df with SHA-1 364a5225be is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15401901
Change-Id: If3b5de0a02d47c1557aba402f1c3e7578fd3ad4b
|
2021-07-30 00:56:03 +00:00 |
|
Chalard Jean
|
b5afc811f3
|
Merge "Fix: ConnectivityManager methods crashing with SecurityException" into sc-dev am: 4e7b1128a4 am: 6bc441cc01
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15401698
Change-Id: Id418d1b4957012ef213b3c99386e172a6bc28cb2
|
2021-07-30 00:55:38 +00:00 |
|
Emilian Peev
|
cdb8e93c9e
|
Merge changes from topic "b194508189" into sc-dev am: e922ec31aa am: f6a51497b9
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15376189
Change-Id: I15a503b76f13f9fa5297695b6c7e8e0a9f718957
|
2021-07-30 00:55:05 +00:00 |
|
Emilian Peev
|
6a4cd834ae
|
Camera: Include the parceled image dimensions am: aee0d658d6 am: 786b5f9249
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15350810
Change-Id: I250615aee0f610cd67507c09b9d9aa612e5c489e
|
2021-07-30 00:54:58 +00:00 |
|
Jayant Chowdhary
|
672955cfa7
|
Merge "camera2: Add fwk-only tags for SCALER_CROP_REGION and metering regions." into sc-dev am: 782b4e9e08 am: 400dab60eb
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15349267
Change-Id: I52b5730441d7e531b476daf783667e275e3ff2ef
|
2021-07-30 00:54:12 +00:00 |
|
Rahul Sabnis
|
8fe06b73b4
|
Merge "Require calls to BluetoothA2dp#setBufferLengthMillis to pass a non-negative value" into sc-dev am: 7a3cb23bf9 am: 5244348b7a
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15404294
Change-Id: Ie6d9a77546ddcd0d809bdde2ae0635751c0a585b
|
2021-07-30 00:53:47 +00:00 |
|
Chris Tate
|
6a1c704e52
|
Merge "Consistent reporting of failure conditions" into sc-dev am: e833132601 am: c43e154a31
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15273601
Change-Id: Idfded0ad796791a3866a3ac7957ad99c19d4f2cc
|
2021-07-30 00:53:31 +00:00 |
|
TreeHugger Robot
|
38cf0b3245
|
[automerger skipped] Merge "resolve merge conflicts of 0f8dfa5326 to sc-v2-dev" into sc-v2-dev am: 24477a6d17 -s ours
am skip reason: Merged-In I07dbb58b234bee06c31a67fd38ab363ff13d9458 with SHA-1 0f8dfa5326 is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15410187
Change-Id: Ia5d934ccefd2344de8ca2c5a5ffe2a2ebadc16cd
|
2021-07-30 00:52:25 +00:00 |
|
Jay Aliomer
|
da8be68189
|
Merge "Reset patterned animations when solid ripple is reset" into sc-dev am: 70c0c93542
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15413252
Change-Id: Iaaf11e4690faf9b16ec4640850b213c7fecd137b
|
2021-07-30 00:49:18 +00:00 |
|
Michael Wachenschwanz
|
b4db3d2505
|
Merge "Log and skip noteEvent calls with null name" into sc-dev am: 0e1ba5a342
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15419007
Change-Id: Ie4baae18cc7495ae337142c99cede75f957bfdd4
|
2021-07-30 00:49:10 +00:00 |
|
Beverly Tai
|
a1089252cd
|
Merge "Add gravity center to layout params" into sc-dev am: 98a4967908
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15411507
Change-Id: I3b0609ebfa57aae1e02078331cbf5e2b43a3154f
|
2021-07-30 00:48:58 +00:00 |
|
Jeff DeCew
|
8f8facbbbc
|
Merge "Fix bug removing semantic colors of CallStyle notification actions." into sc-dev am: 4203db854f
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15405173
Change-Id: If6c4a857e6cc322f8071256bc2645bae74f1274a
|
2021-07-30 00:48:48 +00:00 |
|
Beverly Tai
|
7e67690b82
|
Merge "For devices with udfps, always show bg on udfps" into sc-dev am: d2e60974cb
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15392265
Change-Id: I1d0c75414634c4e2ddfc6dadde0bc5029d2962e9
|
2021-07-30 00:48:37 +00:00 |
|
Nate Myren
|
5d6791f0c6
|
Merge "Add |role to UPDATE_APP_OPS_STATS" into sc-dev am: 71a8968dcb
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15341655
Change-Id: I0e13cd7bcb3eca9525de9aba50e17a21147709ae
|
2021-07-30 00:48:07 +00:00 |
|
Prabir Pradhan
|
dba3350087
|
Merge "InputManagerService: Do not remove input channel when disposing monitor" into sc-dev am: 2f13cca5a6
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15405649
Change-Id: Id4b3d10a1f5b8837621c1252f67e101c449a9e01
|
2021-07-30 00:47:48 +00:00 |
|
Songchun Fan
|
3f47f90e0c
|
Merge "[pm] ignore partial progress update after off-incfs migration" into sc-dev am: 5ba5f1392f
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15405281
Change-Id: I1a62754cd190be0fb576e964c2a9afa3c3eb6b9e
|
2021-07-30 00:47:16 +00:00 |
|
Matt Pietal
|
a313bcd14b
|
Merge "Make sure SIM PIN screen shows" into sc-dev am: c3915dcbe9
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15409421
Change-Id: I4b1c66a045d78fc4c2c640d1049d9e9520d686fb
|
2021-07-30 00:46:56 +00:00 |
|
Beverly Tai
|
fe3a59a636
|
Merge "Rescan face when user preses empty space on LS" into sc-dev am: 866753754b
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15412658
Change-Id: If761e12e7f781415de9430412b88c4c43d431742
|
2021-07-30 00:46:40 +00:00 |
|
Beverly Tai
|
cb50fcf99b
|
Merge "Don't setDeviceEntryIntent on AOD" into sc-dev am: 11f74e42a5
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15412657
Change-Id: I2ec6ae4300a9762316fd251e27e837d35cfe015c
|
2021-07-30 00:46:11 +00:00 |
|
Fiona Campbell
|
3030b865bb
|
Merge "Null check for logicaldisplay" into sc-dev am: fca58882db
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15403077
Change-Id: I8f0d0993eef4ddfb612215c042239a72323af448
|
2021-07-30 00:45:54 +00:00 |
|
Jing Ji
|
357769d696
|
Merge "Fix NullPointerException in PhantomProcessList due to race condition" into sc-dev am: 8b872f5c71
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15404738
Change-Id: Id042e8a63e4cb1570d10dd355da41cd2156fff02
|
2021-07-30 00:45:42 +00:00 |
|
TreeHugger Robot
|
ad5545d354
|
Merge "Disable inline suggestions for afservice when talkback is enabled." into sc-dev am: fda724a5be
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15401901
Change-Id: I696274f2f8e74dc21e814c0b0089a22238a9756a
|
2021-07-30 00:45:15 +00:00 |
|
Chalard Jean
|
6bc441cc01
|
Merge "Fix: ConnectivityManager methods crashing with SecurityException" into sc-dev am: 4e7b1128a4
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15401698
Change-Id: Iad002e42bc2c436ad6a69ff61a3c1b0646dc7e9c
|
2021-07-30 00:44:45 +00:00 |
|
Emilian Peev
|
f6a51497b9
|
Merge changes from topic "b194508189" into sc-dev am: e922ec31aa
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15376189
Change-Id: I9a039d8b92c96043227bb4c81992be4df661e6cf
|
2021-07-30 00:43:16 +00:00 |
|
Emilian Peev
|
786b5f9249
|
Camera: Include the parceled image dimensions am: aee0d658d6
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15350810
Change-Id: I79c6f21512aca4e3a0f8e56980f2dd761c4de7ae
|
2021-07-30 00:43:13 +00:00 |
|
Jayant Chowdhary
|
400dab60eb
|
Merge "camera2: Add fwk-only tags for SCALER_CROP_REGION and metering regions." into sc-dev am: 782b4e9e08
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15349267
Change-Id: Iff5e1364061848ec0d60b0b5d194fab55b21060f
|
2021-07-30 00:42:02 +00:00 |
|
Rahul Sabnis
|
5244348b7a
|
Merge "Require calls to BluetoothA2dp#setBufferLengthMillis to pass a non-negative value" into sc-dev am: 7a3cb23bf9
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15404294
Change-Id: I5837fa60959952d8a8c1e418dfa2f504087df38c
|
2021-07-30 00:41:40 +00:00 |
|
Chris Tate
|
c43e154a31
|
Merge "Consistent reporting of failure conditions" into sc-dev am: e833132601
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15273601
Change-Id: I9794b1650339bc89c454f89d140e6405e62d65ac
|
2021-07-30 00:40:48 +00:00 |
|
TreeHugger Robot
|
24477a6d17
|
Merge "resolve merge conflicts of 0f8dfa5326 to sc-v2-dev" into sc-v2-dev
|
2021-07-30 00:37:14 +00:00 |
|
Jay Aliomer
|
d3f5aee204
|
Merge "Reset patterned animations when solid ripple is reset" into sc-dev am: 70c0c93542 am: 5352493d4a
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15413252
Change-Id: Icbe2c85856c8e706772f95828d3864ff5149df53
|
2021-07-30 00:16:23 +00:00 |
|
Michael Wachenschwanz
|
2026a21f59
|
Merge "Log and skip noteEvent calls with null name" into sc-dev am: 0e1ba5a342 am: b7b6ea7dcd
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15419007
Change-Id: Iba6c1f5edb712414304c2136ff34210a53d3fe35
|
2021-07-30 00:16:16 +00:00 |
|
Martin Brabham
|
a31665ab13
|
Merge "Add implementation for IRK to parcelable functions." am: 400c21483c am: 234cdb9d8a am: a2657cf70a
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1780808
Change-Id: I7aafcd520517394a290a49a42034468d9ca72e7e
|
2021-07-30 00:16:07 +00:00 |
|
Beverly Tai
|
452e060790
|
Merge "Add gravity center to layout params" into sc-dev am: 98a4967908 am: 726af90667
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15411507
Change-Id: I27c9d0a59621169c724bfda6c0a29625942ccb95
|
2021-07-30 00:15:56 +00:00 |
|
Jeff DeCew
|
730b4ffe99
|
Merge "Fix bug removing semantic colors of CallStyle notification actions." into sc-dev am: 4203db854f am: 9da83c7285
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15405173
Change-Id: Id7d9dc3cbce68a74060c901fb55fd2b0baaf0e09
|
2021-07-30 00:15:31 +00:00 |
|
TreeHugger Robot
|
51f19d8d91
|
Merge "Merge "For devices with udfps, always show bg on udfps" into sc-dev am: d2e60974cb am: 041083adec" into sc-v2-dev-plus-aosp
|
2021-07-30 00:12:17 +00:00 |
|
Lyn Han
|
4bbc725f6d
|
resolve merge conflicts of 0f8dfa5326 to sc-v2-dev
Bug: 195033110
Change-Id: I4274fd4024b8cf725f8db7bd0a3fdffd7ec6de84
Merged-In: I07dbb58b234bee06c31a67fd38ab363ff13d9458
|
2021-07-29 23:42:42 +00:00 |
|
Mady Mellor
|
9fb1499dba
|
Merge "Don't use SysUI ScrimController for bubbles" into sc-v2-dev am: 0f7c6bbd4e
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15413213
Change-Id: I2f15459b3155484eeef16ddc126055ba4c3ed29e
|
2021-07-29 22:46:36 +00:00 |
|