Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
796,723 Commits 3 Branches 0 Tags
c5a1a8b0fe57c8d0cb31fd44883f334c1936d602
Commit Graph

796723 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Naomi Musgrave
c5a1a8b0fe Merge "[Media Projection] Require valid token to set session" into tm-dev am: 55ecb4ec82 am: 986c517b77 am: fa30ad6853 am: cb0d7f43a0 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18356863

Change-Id: I518249d759ec459d13d8246bd15a1f71bd4bd43c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-20 16:32:18 +00:00
Songchun Fan
d1d212684c Merge "[pm] replaces some read-only mLock usages with snapshot" 2022-05-20 16:24:01 +00:00
Naomi Musgrave
cb0d7f43a0 Merge "[Media Projection] Require valid token to set session" into tm-dev am: 55ecb4ec82 am: 986c517b77 am: fa30ad6853 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18356863

Change-Id: I6628d4dd134d59873fed774ba904650d9c1c33d7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-20 16:14:04 +00:00
Naomi Musgrave
fa30ad6853 Merge "[Media Projection] Require valid token to set session" into tm-dev am: 55ecb4ec82 am: 986c517b77 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18356863

Change-Id: I94a9283d0f1c931a9aceda44dd28fdb63d049c89
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-20 15:53:40 +00:00
Lucas Lin
b077fbdaca [automerger skipped] Merge "Clear mInterface before calling resetIkeState()" into rvc-dev am: 7ba3a378c5 am: 1f68b323f3 am: 59378118d7 am: 6b1bf26b0b am: 2eb95344c5 -s ours am: 57836676ac -s ours am: e3f2c6048e -s ours am: be74c06ba4 -s ours am: d82c82f702 -s ours 
am skip reason: Merged-In I7f9a1d9afd2a40762e9fac68edf1fb8ae75df8bc with SHA-1 520cc2fde3 is already in history

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

Change-Id: Id4b25766033464cc867163b9bf75cc02d5ef4b13
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-20 14:45:49 +00:00
Treehugger Robot
cd709be703 Merge "Improve the code of handleSessionLost()" am: 6b5a4f3d37 am: 254122ea8b am: 54096e6c67 am: 6ed1a262e5 am: 84ad477376 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2097879

Change-Id: I3c2bcd7d8766922ea42068727880afa8f13f05ec
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-20 14:33:38 +00:00
TreeHugger Robot
a77ce94afd Merge "Show mobile data icon with carrier Wi-Fi level in Quick-Settings" into tm-dev am: f596386556 am: 9be7b92333 am: fce465d412 am: fff8d3bf2f 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18490669

Change-Id: I5dfbc6f5af5b2b2aac35f4c33fdd2990619d93aa
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-20 14:18:02 +00:00
Ricky Wai
b818bd55f9 Merge "Do not update enabled state when app ops is not changed" into tm-dev am: 8d4ecda17e am: f1259a6f97 am: 5389645efa am: 1ef1451300 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18482694

Change-Id: Ia7507cc50b9458561d35adab9fc5b9e7d6723751
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-20 14:02:33 +00:00
Naomi Musgrave
986c517b77 Merge "[Media Projection] Require valid token to set session" into tm-dev am: 55ecb4ec82 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18356863

Change-Id: Ife19064237c6f958e03ba3057cd2dd8bf58e1681
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-20 14:02:05 +00:00
Wesley Wang
483d1a8ce8 Merge "Remove EnhancedEstimates isHybird flag from trigger condition" into tm-dev am: 4788cc8ee1 am: 67a7dc6d84 am: c20a11fb03 am: 056408062f 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18482950

Change-Id: I64eeec1a8ad154a127f2b7ae75dabb444d79a334
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-20 14:01:20 +00:00
Chaohui Wang
9d2e662ed7 Merge changes from topic "jank-toggle" into tm-dev am: dfed7f9e2f am: a6d1018941 am: 8656dd8c07 am: 14b91b052a 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18195532

Change-Id: I27011f2eab64449ee62453f97ce77f314fc7c0c0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-20 14:00:23 +00:00
Alex Johnston
0aa42574c6 Merge "Update network logging delegation docs" into tm-dev am: f428adf2e4 am: b3d9a0fab9 am: 44b6921dea am: 499cb738f9 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18475051

Change-Id: Idf4af1dca5e904d10bb7c36fa6bdd0e975ebe441
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-20 13:59:42 +00:00
Michael Rosenfeld
299dc1714f Merge "Add an option, --reset-all, to dumpsys batterystats." into tm-dev am: 512b28faf4 am: 7a0a92b96d am: 9cf56997a5 am: 4183c9858c 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17950624

Change-Id: I20a2d25f2980974fb0e73fcb699ba135b9ed3f72
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-20 13:58:37 +00:00
Lucas Lin
96b6925774 [automerger skipped] Merge "Clear mInterface before calling resetIkeState()" into rvc-dev am: 7ba3a378c5 am: 1f68b323f3 am: 59378118d7 am: 6b1bf26b0b am: 2eb95344c5 -s ours am: 57836676ac -s ours am: 2770c3c39b -s ours am: 4ec14cc958 -s ours am: 67ca4c3801 -s ours 
am skip reason: Merged-In I7f9a1d9afd2a40762e9fac68edf1fb8ae75df8bc with SHA-1 520cc2fde3 is already in history

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

Change-Id: Ibf46ad216fb42ee40d651bdf968257fc5f4f0949
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-20 13:58:13 +00:00
TreeHugger Robot
8ac31b7eaa Merge "Show mobile data icon with carrier Wi-Fi level in Quick-Settings" into tm-dev am: f596386556 am: 72645f44b2 am: c3756b1c1c am: b7bdc65b0a 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18490669

Change-Id: Id6b80bbd6f9ac0086f45b983e803bc2e43327de6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-20 13:57:36 +00:00
TreeHugger Robot
6325adefe7 [automerger skipped] Merge "[DO NOT MERGE] Revert "Remove VCN Carrier Privilege grace period"" into tm-dev am: 715e111819 am: a5a242d614 am: 2f6fcba92a am: 348d5ec622 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ib8a41db7f23b12fdc05565913acbae8540b75a13
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-20 13:52:58 +00:00
Rambo Wang
a7d1f559c1 [automerger skipped] [DO NOT MERGE] Revert "Remove VCN Carrier Privilege grace period" am: 3a8a004d2a am: e539d7f831 am: 2644c35538 am: f574fff683 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I92cb1b5fca3551551a81a2f4f36968573666cb0c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-20 13:52:40 +00:00
TreeHugger Robot
0b3180e52e Merge "Adjust LogAccessDialog themeing for TV" into tm-dev am: 24928c481d am: c944dd27b0 am: 85e544e626 am: 8a1c1996eb 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17907954

Change-Id: I75428c742c4e332b15f92ab9764380774c0b9089
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-20 13:52:06 +00:00
Calvin Pan
96bd83fcfa Merge "Avoid printing call stack for the app that doesn't add the LocaleConfig" into tm-dev am: cdcff91c57 am: db208be062 am: bf9ff671b7 am: 97c4a796fe 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18452917

Change-Id: Id4d49be3904d3cc1d808ba84ddb4440166edf03f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-20 13:51:24 +00:00
Arc Wang
a47afb0d1a Merge "Change ripple color for Spinner" into tm-dev am: 20efd509d8 am: c2997016c9 am: 845b49fe96 am: 9389c841e9 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18482945

Change-Id: I78001d30ddad1881c7603cac139b012cf44dff09
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-20 13:50:47 +00:00
TreeHugger Robot
953ef6192e Merge "Launch app intent after unlock" into tm-dev am: ff1ae8716f am: d774ce125f am: 6327763760 am: 85272c21f7 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18455155

Change-Id: I209b0e7c4117c099533f105c9d4ae1c4bb3e0a8e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-20 13:50:12 +00:00
Ricky Wai
193d7d3fba Merge "Do not update enabled state when app ops is not changed" into tm-dev am: 8d4ecda17e am: a70da224db am: 638a70b7b3 am: 3c223f825b 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18482694

Change-Id: I0ec4c52e7c85bd3d306e42a990cc6d6c9135c489
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-20 13:49:38 +00:00
Lucas Lin
ef926a414d [automerger skipped] Merge "Clear mInterface before calling resetIkeState()" into rvc-dev am: 7ba3a378c5 am: 1f68b323f3 am: 59378118d7 am: 6b1bf26b0b am: 2eb95344c5 -s ours am: 57836676ac -s ours am: 2770c3c39b -s ours am: aa45f5f929 -s ours am: 62d95a9c52 -s ours 
am skip reason: Merged-In I7f9a1d9afd2a40762e9fac68edf1fb8ae75df8bc with SHA-1 520cc2fde3 is already in history

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

Change-Id: Id3ee3481d321d89a319d3a136faedf994529eeb7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-20 13:49:15 +00:00
TreeHugger Robot
b37c9a66ca Merge "Show mobile data icon with carrier Wi-Fi level in Quick-Settings" into tm-dev am: f596386556 am: 72645f44b2 am: 0b120625df am: 688e796a4f 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18490669

Change-Id: Ie4bd2a085622148ed7bbaf4b85a73769c00d9eeb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-20 13:48:41 +00:00
Automerger Merge Worker
f287bdc441 Merge "Merge "Remove EnhancedEstimates isHybird flag from trigger condition" into tm-dev am: 4788cc8ee1 am: 308a7d8451 am: ac4834c66e" into tm-qpr-dev-plus-aosp am: f11a1192cf 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18482950

Change-Id: Ifcdaa27002d6fdb6385e247a87ad0c4cdaab9a33
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-20 13:48:01 +00:00
Ricky Wai
4feb3f50c4 Merge "Do not update enabled state when app ops is not changed" into tm-dev am: 8d4ecda17e am: a70da224db am: f4b7d5e2f9 am: db11f63352 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18482694

Change-Id: I7057463dc163c01cdb9ed765d9a1cee20741db4c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-20 13:47:15 +00:00
Automerger Merge Worker
73aa87d2cd Merge "Merge changes from topic "jank-toggle" into tm-dev am: dfed7f9e2f am: 623ab35698 am: 6b8d237d6c" into tm-qpr-dev-plus-aosp am: 20ff9f2029 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18195532

Change-Id: Ib398ee3c0766821248e7d1da742414f7ed7c5467
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-20 13:46:13 +00:00
Wesley Wang
c5e455d77d Merge "Remove EnhancedEstimates isHybird flag from trigger condition" into tm-dev am: 4788cc8ee1 am: 308a7d8451 am: d2ee53f6b0 am: f38c15ea65 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18482950

Change-Id: Ic4561f1ed80149c819ee49f141c4476d7b02e169
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-20 13:45:05 +00:00
Automerger Merge Worker
1b9c2b92bc Merge "Merge changes from topic "jank-toggle" into tm-dev am: dfed7f9e2f am: 623ab35698 am: bad397b9b4" into tm-qpr-dev-plus-aosp am: 0639d400b3 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18195532

Change-Id: I03364fad60e1b6140c3fb3d73306b38cafa98f0e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-20 13:44:19 +00:00
Naomi Musgrave
55ecb4ec82 Merge "[Media Projection] Require valid token to set session" into tm-dev 2022-05-20 13:39:48 +00:00
Alex Johnston
97cd2800ac Merge "Update network logging delegation docs" into tm-dev am: f428adf2e4 am: 2e71fc0ac5 am: 2b388d9586 am: 9cb3a2e156 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18475051

Change-Id: Ia27ea67f00b33d419786a83265fdf6718e65e136
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-20 13:35:17 +00:00
Michael Rosenfeld
c70a9ccf2a Merge "Add an option, --reset-all, to dumpsys batterystats." into tm-dev am: 512b28faf4 am: 9c53571bee am: 97ca52ca3c am: 180dfe879a 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17950624

Change-Id: Ifd2ddb82562855bd7bca2458a25aac538da38ec4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-20 13:34:47 +00:00
TreeHugger Robot
a01761f420 [automerger skipped] Merge "[DO NOT MERGE] Revert "Remove VCN Carrier Privilege grace period"" into tm-dev am: 715e111819 am: 076a9e612a am: 947d31c533 am: 4335d5b8d7 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I95af97412f2c24bc34d867faecd8a14196e98989
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-20 13:34:18 +00:00
Rambo Wang
294dd55a72 [automerger skipped] [DO NOT MERGE] Revert "Remove VCN Carrier Privilege grace period" am: 3a8a004d2a am: 597690dc7f am: a23b16281b am: 9759967f4d -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ia0e71f9c356f51a00fbd4b92cb4a4db1bf5515df
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-20 13:34:02 +00:00
Alex Johnston
4cc20438ee Merge "Update network logging delegation docs" into tm-dev am: f428adf2e4 am: 2e71fc0ac5 am: 9e5d639171 am: 497db1c994 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18475051

Change-Id: I10061cbb9e7360fa321cadcaa4cb6df472ec7700
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-20 13:33:04 +00:00
Automerger Merge Worker
5c76b70f47 Merge "Merge "Adjust LogAccessDialog themeing for TV" into tm-dev am: 24928c481d am: c0477b594d am: f7ff200a1c" into tm-qpr-dev-plus-aosp am: 27a1769c66 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17907954

Change-Id: I258fc84200c9255d473dc3356c0143c133b1969c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-20 13:32:25 +00:00
Michael Rosenfeld
f2b3b7fc88 Merge "Add an option, --reset-all, to dumpsys batterystats." into tm-dev am: 512b28faf4 am: 9c53571bee am: b5f587503b am: ded968787c 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17950624

Change-Id: I49878bacb84fc5fd7399d4e792afd57f2db22c97
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-20 13:30:53 +00:00
TreeHugger Robot
47faac2112 [automerger skipped] Merge "[DO NOT MERGE] Revert "Remove VCN Carrier Privilege grace period"" into tm-dev am: 715e111819 am: 076a9e612a am: c08e893b21 am: dfc0d001ee -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ica5e32b85ec30ac1441639f677ae2285c2ae1a2a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-20 13:30:09 +00:00
Lucas Lin
d82c82f702 [automerger skipped] Merge "Clear mInterface before calling resetIkeState()" into rvc-dev am: 7ba3a378c5 am: 1f68b323f3 am: 59378118d7 am: 6b1bf26b0b am: 2eb95344c5 -s ours am: 57836676ac -s ours am: e3f2c6048e -s ours am: be74c06ba4 -s ours 
am skip reason: Merged-In I7f9a1d9afd2a40762e9fac68edf1fb8ae75df8bc with SHA-1 520cc2fde3 is already in history

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

Change-Id: I55cf32e78d94ec13ae7ce453550dea6a7864277d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-20 13:29:57 +00:00
Rambo Wang
13450e8f0e [automerger skipped] [DO NOT MERGE] Revert "Remove VCN Carrier Privilege grace period" am: 3a8a004d2a am: 597690dc7f am: 30395da568 am: 3133391cae -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I67829adb7cf236831ff896165ad94dc4a16cef7c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-20 13:29:52 +00:00
TreeHugger Robot
0f9a6790a2 Merge "Adjust LogAccessDialog themeing for TV" into tm-dev am: 24928c481d am: c0477b594d am: 369a6d717f am: b65c48bf9d 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17907954

Change-Id: Ia2d421d02a067421c80379739b44b59da220f809
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-20 13:28:37 +00:00
Calvin Pan
6e9451a29d Merge "Avoid printing call stack for the app that doesn't add the LocaleConfig" into tm-dev am: cdcff91c57 am: 3b35df974a am: ae4658500e am: be8134a437 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18452917

Change-Id: I24e25b434e7c0bab8ca3072bed94ec634be30477
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-20 13:27:57 +00:00
Arc Wang
7c6e2ff546 Merge "Change ripple color for Spinner" into tm-dev am: 20efd509d8 am: c58e951066 am: 334d8a8626 am: 7887c5050e 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18482945

Change-Id: I332c765149ebb51b6036838fe0c595209db92f82
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-20 13:27:03 +00:00
TreeHugger Robot
988ed22413 Merge "Reduce unnecessary redraw of wallpaper with shell transition" into tm-qpr-dev am: 6caa590ae4 am: e3abfc10b6 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18400684

Change-Id: I00b4442af6ec6d8e94653bfbf698c9fdfdb06221
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-20 13:26:17 +00:00
TreeHugger Robot
3947349c6b Merge "Launch app intent after unlock" into tm-dev am: ff1ae8716f am: 1c458d3522 am: 9e0cced1e2 am: af818c7a15 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18455155

Change-Id: I9510280263a894f40b3d40af8e656e93745c6186
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-20 13:25:39 +00:00
Calvin Pan
62d0722ac4 Merge "Avoid printing call stack for the app that doesn't add the LocaleConfig" into tm-dev am: cdcff91c57 am: 3b35df974a am: cdcc0c0fa4 am: ffd23ea0ca 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18452917

Change-Id: Ie0c89be2c7a593ca7d42f9664e41643cf4351e26
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-20 13:24:18 +00:00
Arc Wang
1f4dbb9384 Merge "Change ripple color for Spinner" into tm-dev am: 20efd509d8 am: c58e951066 am: 9fc3ff453a am: 5eefadd30e 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18482945

Change-Id: Ie720ac1efd5f19bba006bc47cf3089f0b26f96ae
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-20 13:23:17 +00:00
Issei Suzuki
b9dcb581e4 [automerger skipped] Merge "Add ActivityOption to remove keyguard when an activity is launched." into tm-d1-dev am: a198a65234 -s ours am: 27a11f47d5 -s ours am: 80695f752b -s ours 
am skip reason: Merged-In Ia83da6286875f1a539edbaf515fe01c07ce1ba76 with SHA-1 1df71d4e7b is already in history

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

Change-Id: I32777a04db3e87e189cf1b873a67b4d42f1b7311
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-20 13:22:41 +00:00
Issei Suzuki
d99841fc66 [automerger skipped] Add ActivityOption to remove keyguard when an activity is launched. am: 36f0a83ead -s ours am: 4d8b1e26c1 -s ours am: d51938deb3 -s ours 
am skip reason: Merged-In Ia83da6286875f1a539edbaf515fe01c07ce1ba76 with SHA-1 1df71d4e7b is already in history

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

Change-Id: I3cecf8f9c7c75307822851f78af33ff7ef20a3de
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-20 13:22:25 +00:00
TreeHugger Robot
1f02ef4d02 Merge "Launch app intent after unlock" into tm-dev am: ff1ae8716f am: 1c458d3522 am: d8f6763ccb am: a18b2410fd 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18455155

Change-Id: I21cc7045ea4c8378724391ab700f9a8d4d13059f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-20 13:21:50 +00:00