Commit Graph

16787 Commits

Author SHA1 Message Date
Treehugger Robot
29102277cb Merge "Do not canonicalize overlay config test paths" am: e2ddd9d277 am: 4c656c86bb am: f22f8c702d am: 63480e3b79
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1725991

Change-Id: I368cb0a913ac53919d4d02c7c08a978d9b89c74c
2021-06-04 18:34:40 +00:00
Treehugger Robot
63480e3b79 Merge "Do not canonicalize overlay config test paths" am: e2ddd9d277 am: 4c656c86bb am: f22f8c702d
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1725991

Change-Id: Icce4a5a026fffa62bddfd50bf79602059cecf4cc
2021-06-04 18:13:55 +00:00
Treehugger Robot
f22f8c702d Merge "Do not canonicalize overlay config test paths" am: e2ddd9d277 am: 4c656c86bb
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1725991

Change-Id: I5806544243cc7e849e2612c217d73a659e40412b
2021-06-04 17:50:31 +00:00
Treehugger Robot
e2ddd9d277 Merge "Do not canonicalize overlay config test paths" 2021-06-04 17:04:49 +00:00
Wu Ahan
e3d691dcb5 Merge changes from topic "unlock_jank_instrument" into sc-dev am: 924618b41c am: a8631c1486 am: 9ba1512b2d
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14419588

Change-Id: I782cfdcdcf2a04da831b5a4b7057fd1ff151610b
2021-06-04 11:17:36 +00:00
Joe Bolinger
d361a6bbd2 Merge "Fix feedback and animations for face to fingerprint fallback authentication." into sc-dev am: 896ac3e18f am: 9c613a484d am: 28b70ca276
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14823790

Change-Id: Ib224bbcf91f451e5d8c69dd65d627e3c991b08d4
2021-06-04 11:14:17 +00:00
Jing Ji
9b2a5fab1e Merge "Remove some system_server_wtf in proc stats tracking" into sc-dev am: d1c9c0785c am: 700394acca am: 8636637660
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14804421

Change-Id: Ia87f03d389bb069a0836e892d6f45fe491752b5e
2021-06-04 11:02:28 +00:00
Wu Ahan
9ba1512b2d Merge changes from topic "unlock_jank_instrument" into sc-dev am: 924618b41c am: a8631c1486
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14419588

Change-Id: I549313a474f53c9e679f6b30dc9fb1cfe87ba929
2021-06-04 10:52:45 +00:00
Joe Bolinger
28b70ca276 Merge "Fix feedback and animations for face to fingerprint fallback authentication." into sc-dev am: 896ac3e18f am: 9c613a484d
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14823790

Change-Id: I955d7a878a8e8a917e633efa902e89ffedfc7dbb
2021-06-04 10:44:45 +00:00
Jing Ji
8636637660 Merge "Remove some system_server_wtf in proc stats tracking" into sc-dev am: d1c9c0785c am: 700394acca
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14804421

Change-Id: If595e3a720f8ff79c0bbbeaf581ac08b98944ac7
2021-06-04 10:41:19 +00:00
Wu Ahan
a8631c1486 Merge changes from topic "unlock_jank_instrument" into sc-dev am: 924618b41c
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14419588

Change-Id: Ie9e92295519be25bcdbaf889d0a16cfd40075a98
2021-06-04 05:38:13 +00:00
Wu Ahan
924618b41c Merge changes from topic "unlock_jank_instrument" into sc-dev
* changes:
  Instrument jank and latency of the unlock animation of lockscreen
  Support configuration as parameter while beginning the instrumentation
2021-06-04 04:19:38 +00:00
Joe Bolinger
9c613a484d Merge "Fix feedback and animations for face to fingerprint fallback authentication." into sc-dev am: 896ac3e18f
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14823790

Change-Id: Ia43474de4d06c8809543f51d36c7198e445e0d3c
2021-06-04 00:17:25 +00:00
Joe Bolinger
896ac3e18f Merge "Fix feedback and animations for face to fingerprint fallback authentication." into sc-dev 2021-06-04 00:12:40 +00:00
Joe Bolinger
9f685a9fa7 Fix feedback and animations for face to fingerprint fallback authentication.
Bug: 189164072
Test: atest com.android.systemui.biometrics com.android.server.biometrics
Change-Id: I7fe8085dc4a4994c591bb4be20309ffb46bb06e9
2021-06-03 14:41:29 -07:00
Jing Ji
700394acca Merge "Remove some system_server_wtf in proc stats tracking" into sc-dev am: d1c9c0785c
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14804421

Change-Id: Idf5b8833ea8efa7496d6647300459a4410fca9bd
2021-06-03 21:29:21 +00:00
Jing Ji
d1c9c0785c Merge "Remove some system_server_wtf in proc stats tracking" into sc-dev 2021-06-03 21:15:33 +00:00
Jeff DeCew
92e85d9eff Merge "Always highlight unread count" into sc-dev am: 834bf3a8e0 am: 07952f728a am: 9735947558
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14805378

Change-Id: If0e8adaf2dc58a31a1134561fdff774540924c76
2021-06-03 19:35:04 +00:00
Jeff DeCew
9735947558 Merge "Always highlight unread count" into sc-dev am: 834bf3a8e0 am: 07952f728a
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14805378

Change-Id: I8d9592ad564523e848e5276815e4848f3045bc3a
2021-06-03 19:02:06 +00:00
Jeff DeCew
07952f728a Merge "Always highlight unread count" into sc-dev am: 834bf3a8e0
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14805378

Change-Id: If94087c14df737d6cc60e7f5c4e0b7d5fc06c36e
2021-06-03 18:43:38 +00:00
Jeff DeCew
834bf3a8e0 Merge "Always highlight unread count" into sc-dev 2021-06-03 18:16:26 +00:00
Jeff DeCew
84b5f7c714 Merge "Remove redundant margin update, which caused infinite layout loop." into sc-dev am: a39cdd1273 am: 87e78d4d30 am: c8c94630b3
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14805375

Change-Id: Icfd3545603b7bd7abc159f7c99bbe3399c8ce581
2021-06-03 17:58:22 +00:00
Dmitri Plotnikov
e012266a38 Merge "Store binder thread CPU times in the summary parcel" into sc-dev am: 80efce1f41 am: 002a897990 am: b96389df9d
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14737123

Change-Id: Ia0dc806f6b913255bd2fa51bb9bdf7617099c19c
2021-06-03 17:57:45 +00:00
Jeff DeCew
c8c94630b3 Merge "Remove redundant margin update, which caused infinite layout loop." into sc-dev am: a39cdd1273 am: 87e78d4d30
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14805375

Change-Id: I8b5bc1a235b7f87ef18db95795ad7c7067cb6fdf
2021-06-03 17:44:48 +00:00
Dmitri Plotnikov
b96389df9d Merge "Store binder thread CPU times in the summary parcel" into sc-dev am: 80efce1f41 am: 002a897990
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14737123

Change-Id: Ie278eede6b189d2e8b0aeebb3d03c2b8d94e5b01
2021-06-03 17:44:27 +00:00
Jeff DeCew
87e78d4d30 Merge "Remove redundant margin update, which caused infinite layout loop." into sc-dev am: a39cdd1273
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14805375

Change-Id: I29d07b8eb7d1c5952513476a3f2289691fbeb13d
2021-06-03 17:25:42 +00:00
Dmitri Plotnikov
002a897990 Merge "Store binder thread CPU times in the summary parcel" into sc-dev am: 80efce1f41
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14737123

Change-Id: Idc3e9c95d9634bf77394c54d99cd429f3bb0b726
2021-06-03 17:25:07 +00:00
Jeff DeCew
a39cdd1273 Merge "Remove redundant margin update, which caused infinite layout loop." into sc-dev 2021-06-03 17:04:50 +00:00
Dmitri Plotnikov
80efce1f41 Merge "Store binder thread CPU times in the summary parcel" into sc-dev 2021-06-03 17:04:19 +00:00
Jeff DeCew
7f8bcb8add Always highlight unread count
Fixes: 188646708
Test: get unread count within a group
Change-Id: I41d67e5e488e0d3dbc3873d6d50d55ec4ab8c9f2
2021-06-03 11:50:28 -04:00
Jeff DeCew
e0fb0e6162 Remove redundant margin update, which caused infinite layout loop.
Fixes: 186217151
Fixes: 183970366
Test: altered build to always show feedback icons, then exhaustively tested conversation notifications.
Change-Id: I19a1428d7fcda35efc3d15b198c5b8d04a30d869
2021-06-03 10:57:25 -04:00
John Tsai
d43c64b474 Merge "Revert "Release cblocks back to the free pool"" into sc-dev am: 5d1934f765 am: 1feca3fd23 am: a70195fd55
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14809870

Change-Id: Id7f8f1f87bdf3e0877a1f82886dd68f8698718a3
2021-06-03 03:00:07 +00:00
John Tsai
a70195fd55 Merge "Revert "Release cblocks back to the free pool"" into sc-dev am: 5d1934f765 am: 1feca3fd23
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14809870

Change-Id: I227a816c53ed38c13fd6047ce80b56a7863497de
2021-06-03 02:52:20 +00:00
John Tsai
1feca3fd23 Merge "Revert "Release cblocks back to the free pool"" into sc-dev am: 5d1934f765
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14809870

Change-Id: I963556bc97384196c780b2f8bce8c5a869f53d7a
2021-06-03 02:33:21 +00:00
John Tsai
5d1934f765 Merge "Revert "Release cblocks back to the free pool"" into sc-dev 2021-06-03 02:13:03 +00:00
John Tsai
516cb2d025 Revert "Release cblocks back to the free pool"
This reverts commit e41b029d85.

Reason for revert: b/189985437

com.android.tradefed.targetprep.TargetSetupError[APK_INSTALLATION_FAILED|520001|DEPENDENCY_ISSUE]: Failed to install com.android.devicehealthchecks with ...

Change-Id: I06fe7d94f6dab474c74b093de8692f08d4031b62
2021-06-03 02:10:26 +00:00
Svetoslav Ganov
ae1d49549a Merge "Switch media fw permissions checks to AttributionSource" into sc-dev am: 1028eb2f62 am: 94893b35e0
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14664152

Change-Id: I5dfa6199ec032779c732e916d6622427466c3f2f
2021-06-02 23:28:02 +00:00
Svetoslav Ganov
94893b35e0 Merge "Switch media fw permissions checks to AttributionSource" into sc-dev am: 1028eb2f62
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14664152

Change-Id: I1403b08f25c663715fd0a99a40f484a4e7ecf410
2021-06-02 23:19:16 +00:00
Svetoslav Ganov
1028eb2f62 Merge "Switch media fw permissions checks to AttributionSource" into sc-dev 2021-06-02 23:07:22 +00:00
Jing Ji
e2c4bcbf13 Remove some system_server_wtf in proc stats tracking
As those could be valid cases

Bug: 18643865
Test: Manual
Change-Id: I3391af28d8fe59e84b27a32889a6f4a4eaa42dea
2021-06-02 15:03:26 -07:00
Patrick Baumann
c11f6f59e0 Merge "Release cblocks back to the free pool" into sc-dev am: 81858ab41c am: 0fe981de59 am: 011292e331
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14736611

Change-Id: I93134c9a782a07f5564f72bd087d93e0c06f3713
2021-06-02 21:34:38 +00:00
Patrick Baumann
011292e331 Merge "Release cblocks back to the free pool" into sc-dev am: 81858ab41c am: 0fe981de59
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14736611

Change-Id: Ib309817eb2f390d4d80df669064c77e3d62ad314
2021-06-02 21:17:13 +00:00
Ryan Mitchell
2c9685573f Do not canonicalize overlay config test paths
Some devices may not have certain partitions available and the
OverlayConfigTests use hardcoded paths to test OverlayConfig
functionality. This change ensures that the temporary directory
created to test OverlayConfig has all of the partitions defined in
PackagePartitions#SYSTEM_PARTITIONS within it.

Bug: 187020117
Bug: 187020675
Test: atest OverlayConfigTest
Change-Id: I511e24b7ccfe82e6e89ceea7107457439793ef77
2021-06-02 21:12:18 +00:00
Patrick Baumann
0fe981de59 Merge "Release cblocks back to the free pool" into sc-dev am: 81858ab41c
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14736611

Change-Id: I3d4991f62de1a67103c7d4ebc367e5719654f619
2021-06-02 20:49:22 +00:00
Patrick Baumann
81858ab41c Merge "Release cblocks back to the free pool" into sc-dev 2021-06-02 20:35:15 +00:00
Song Hu
6320a5f6ce Merge "Add sharesheet logging for empty direct share row and app share prediction timeout." into sc-dev am: 2ab80e4562 am: 0e2a5da970 am: 3292368408
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14788759

Change-Id: I745bfa820828a78049133cc323f309934b511da5
2021-06-02 19:48:19 +00:00
Song Hu
3292368408 Merge "Add sharesheet logging for empty direct share row and app share prediction timeout." into sc-dev am: 2ab80e4562 am: 0e2a5da970
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14788759

Change-Id: I830b7c93ffc3b2fa91edafa2c57fdc7ee76e97e8
2021-06-02 19:30:54 +00:00
Song Hu
0e2a5da970 Merge "Add sharesheet logging for empty direct share row and app share prediction timeout." into sc-dev am: 2ab80e4562
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14788759

Change-Id: Iee0aa9612ec59c7f24e6c46fdc9b74c58c10d79f
2021-06-02 19:27:19 +00:00
Song Hu
2ab80e4562 Merge "Add sharesheet logging for empty direct share row and app share prediction timeout." into sc-dev 2021-06-02 19:03:16 +00:00
Song Hu
8b352b94c0 Add sharesheet logging for empty direct share row and app share
prediction timeout.

Bug: 189833783
Test: atest ChooserActivityTest & manual verification
Change-Id: Id24c6a2495b6a4f778b14028ee5ab975d88e9870
2021-06-02 09:22:44 -07:00