Sunny Goyal
|
3f22f0fe28
|
Updating work profile badge icon
Bug: 201536721
Test: Verified on device
Change-Id: I10d04c8b8c393eb3d5b3c94841e3dd0d3e4a9851
|
2021-09-29 16:35:58 -07:00 |
|
Baligh Uddin
|
0b488bfdb2
|
Remove frameworks/base/apex/appsearch and associated tests
BUG: 192108282
Test: TH
Merged-In: I734c4e830488d2e67977d784223472b2d7e5dde9
Change-Id: I38469ad5df100e90aba81bbdc82078b568301f09
|
2021-09-29 23:28:03 +00:00 |
|
Suprabh Shukla
|
17a7d79ff4
|
Merge "Redact key value from log when DEBUG is false"
|
2021-09-29 23:25:21 +00:00 |
|
TreeHugger Robot
|
e10d87b485
|
Merge "Add multi-user jank monitoring" into sc-v2-dev am: 89f022ac99
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15891027
Change-Id: I8f5811c0f3d625c13422a9bcb050295bf7789368
|
2021-09-29 22:42:20 +00:00 |
|
TreeHugger Robot
|
89f022ac99
|
Merge "Add multi-user jank monitoring" into sc-v2-dev
|
2021-09-29 22:31:47 +00:00 |
|
Lucas Dupin
|
923be59249
|
Merge "Fix issue where scrim would be transparent" into sc-qpr1-dev am: 48647682a0 am: af936c0ce1
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15936303
Change-Id: Id5fabe2f2f378c5dd3ec7d3b643d349440685a9e
|
2021-09-29 22:04:14 +00:00 |
|
Lucas Dupin
|
27458498aa
|
Merge "Fix issue where scrim would be transparent" into sc-qpr1-dev am: 48647682a0 am: ef35ff2146
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15936303
Change-Id: Ib080f70fbc31aa7b4d1dc98886e515c0e68e875b
|
2021-09-29 22:03:52 +00:00 |
|
Lucas Dupin
|
ef35ff2146
|
Merge "Fix issue where scrim would be transparent" into sc-qpr1-dev am: 48647682a0
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15936303
Change-Id: I59138d29458b23ad980ac5a8418cc168e3c50d4d
|
2021-09-29 21:54:12 +00:00 |
|
Lucas Dupin
|
af936c0ce1
|
Merge "Fix issue where scrim would be transparent" into sc-qpr1-dev am: 48647682a0
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15936303
Change-Id: I561df3f5a26ba3945d223bac3e9407810d3343d1
|
2021-09-29 21:54:10 +00:00 |
|
Lucas Dupin
|
48647682a0
|
Merge "Fix issue where scrim would be transparent" into sc-qpr1-dev
|
2021-09-29 21:38:53 +00:00 |
|
Brad Ebinger
|
cd91a0f9f4
|
[automerger skipped] Merge "Add a device overlay for radio off delay due to IMS deregistration" am: 6a5e594515 am: e211df78dc am: b26396ab94 am: 48942a0a6c -s ours
am skip reason: Merged-In Id7b16d75c512106b56cb49974570811679498a0b with SHA-1 79bc4faa83 is already in history
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1832710
Change-Id: I0db444a5479252c3edf598bcec0cf8e7bfc823f6
|
2021-09-29 19:17:48 +00:00 |
|
Automerger Merge Worker
|
2c5687288e
|
Merge "[automerger skipped] Merge changes from topic "b196691596" into sc-dev am: 7b3e40dd63 -s ours am: de460d153e -s ours" into sc-qpr1-dev-plus-aosp am: 27ffbed7f8 -s ours
am skip reason: Merged-In I4a29c47f218046d0852178ad5dc7484a86ef8607 with SHA-1 46fff422b4 is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15919150
Change-Id: I2d0aac99723ccb1dbf25eb2a3f044c3c3ffbd4a5
|
2021-09-29 19:17:22 +00:00 |
|
Automerger Merge Worker
|
c9a8674ecb
|
Merge changes from topic "am-242e7057c303476d9bf9b440aeb2b9a6" into sc-v2-dev-plus-aosp
* changes:
[automerger skipped] Merge changes from topic "b196691596" into sc-dev am: 7b3e40dd63 am: 17a68e2bb4 -s ours am: 258a30ee51 -s ours
[automerger skipped] Limit refresh rates if skin temperature is high am: 7e783bb071 am: 18188ea718 -s ours am: 1730e32644 -s ours
|
2021-09-29 19:16:00 +00:00 |
|
Brad Ebinger
|
48942a0a6c
|
Merge "Add a device overlay for radio off delay due to IMS deregistration" am: 6a5e594515 am: e211df78dc am: b26396ab94
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1832710
Change-Id: I8fcf0b9e866840486cd409d67bdcdb6036379546
|
2021-09-29 19:15:10 +00:00 |
|
TreeHugger Robot
|
b1914a79fe
|
[automerger skipped] Merge changes from topic "b196691596" into sc-dev am: 7b3e40dd63 -s ours am: de460d153e -s ours am: c22056bba2 -s ours
am skip reason: Merged-In I4a29c47f218046d0852178ad5dc7484a86ef8607 with SHA-1 448dd444ad is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15919150
Change-Id: I1f8a7352f1d724bf1ac889e24d8e2cb925bf7332
|
2021-09-29 19:14:45 +00:00 |
|
TreeHugger Robot
|
4af6bb4c54
|
[automerger skipped] Merge changes from topic "b196691596" into sc-dev am: 7b3e40dd63 am: 17a68e2bb4 -s ours am: 258a30ee51 -s ours
am skip reason: Merged-In I4a29c47f218046d0852178ad5dc7484a86ef8607 with SHA-1 448dd444ad is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15919150
Change-Id: Ia7b4167fe670a65c260276966d23e963068275c4
|
2021-09-29 19:14:27 +00:00 |
|
Long Ling
|
2315e6e7ab
|
[automerger skipped] Limit refresh rates if skin temperature is high am: 7e783bb071 am: 18188ea718 -s ours am: 1730e32644 -s ours
am skip reason: Merged-In I37b5b05a363a3d4f2ed3626109206863b664ba66 with SHA-1 f1b1ef1c38 is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15911112
Change-Id: I965d040b6d8f56c810ae513076861eaebb098c48
|
2021-09-29 19:14:13 +00:00 |
|
Brad Ebinger
|
b26396ab94
|
Merge "Add a device overlay for radio off delay due to IMS deregistration" am: 6a5e594515 am: e211df78dc
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1832710
Change-Id: Icd10f46cfaa00ff940a82d54e4cde2d283930a5f
|
2021-09-29 18:45:11 +00:00 |
|
Automerger Merge Worker
|
27ffbed7f8
|
Merge "[automerger skipped] Merge changes from topic "b196691596" into sc-dev am: 7b3e40dd63 -s ours am: de460d153e -s ours" into sc-qpr1-dev-plus-aosp
|
2021-09-29 18:41:13 +00:00 |
|
TreeHugger Robot
|
258a30ee51
|
[automerger skipped] Merge changes from topic "b196691596" into sc-dev am: 7b3e40dd63 am: 17a68e2bb4 -s ours
am skip reason: Merged-In I4a29c47f218046d0852178ad5dc7484a86ef8607 with SHA-1 448dd444ad is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15919150
Change-Id: Idf8bba938b244e016bdd1f674a6c737e86611466
|
2021-09-29 18:40:44 +00:00 |
|
Long Ling
|
1730e32644
|
[automerger skipped] Limit refresh rates if skin temperature is high am: 7e783bb071 am: 18188ea718 -s ours
am skip reason: Merged-In I37b5b05a363a3d4f2ed3626109206863b664ba66 with SHA-1 f1b1ef1c38 is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15911112
Change-Id: I3c2ac19da865619f7cdc8cfc4bd2cd1d24ace380
|
2021-09-29 18:40:42 +00:00 |
|
TreeHugger Robot
|
bf1303a375
|
[automerger skipped] Merge changes from topic "b196691596" into sc-dev am: 7b3e40dd63 -s ours am: de460d153e -s ours
am skip reason: Merged-In I4a29c47f218046d0852178ad5dc7484a86ef8607 with SHA-1 448dd444ad is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15919150
Change-Id: I7b6756de3c4a78be4711a8e0e52abcafe4a130b2
|
2021-09-29 18:40:33 +00:00 |
|
TreeHugger Robot
|
c22056bba2
|
[automerger skipped] Merge changes from topic "b196691596" into sc-dev am: 7b3e40dd63 -s ours am: de460d153e -s ours
am skip reason: Merged-In I4a29c47f218046d0852178ad5dc7484a86ef8607 with SHA-1 448dd444ad is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15919150
Change-Id: Iabf142a9d4c5d2e5152042cab91b440219f455d7
|
2021-09-29 18:40:31 +00:00 |
|
Brad Ebinger
|
e211df78dc
|
Merge "Add a device overlay for radio off delay due to IMS deregistration" am: 6a5e594515
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1832710
Change-Id: I00bf7a8ddc67cd819e16776b9ec62bfe72bb3db6
|
2021-09-29 18:31:25 +00:00 |
|
TreeHugger Robot
|
17a68e2bb4
|
Merge changes from topic "b196691596" into sc-dev am: 7b3e40dd63
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15919150
Change-Id: I20efb6ef7a517c11feef94fd8d7c06ad59f5a33a
|
2021-09-29 18:27:09 +00:00 |
|
Long Ling
|
18188ea718
|
Limit refresh rates if skin temperature is high am: 7e783bb071
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15911112
Change-Id: If5d474577f9492ee64e69deec9e56eaba92e6496
|
2021-09-29 18:27:00 +00:00 |
|
TreeHugger Robot
|
de460d153e
|
[automerger skipped] Merge changes from topic "b196691596" into sc-dev am: 7b3e40dd63 -s ours
am skip reason: Merged-In I4a29c47f218046d0852178ad5dc7484a86ef8607 with SHA-1 448dd444ad is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15919150
Change-Id: Iceeb1fe625be569c275a8c570daa42766c481e9f
|
2021-09-29 18:25:09 +00:00 |
|
Brad Ebinger
|
6a5e594515
|
Merge "Add a device overlay for radio off delay due to IMS deregistration"
|
2021-09-29 18:15:58 +00:00 |
|
TreeHugger Robot
|
7b3e40dd63
|
Merge changes from topic "b196691596" into sc-dev
* changes:
Separate refresh rate restrictions for different High Brightness Modes
Limit refresh rates if skin temperature is high
|
2021-09-29 18:11:42 +00:00 |
|
Kevin Chyn
|
d30c2ebfc0
|
Merge "Ensure face icon controller is deactivated when view is detached" into sc-v2-dev am: 5f833103f9
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15935606
Change-Id: Ia43c5429ebcd201a73e5930058efae8764205ad6
|
2021-09-29 18:10:40 +00:00 |
|
Kevin Chyn
|
5f833103f9
|
Merge "Ensure face icon controller is deactivated when view is detached" into sc-v2-dev
|
2021-09-29 17:55:17 +00:00 |
|
Bill Yi
|
7d64542b5e
|
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: b0cde68ecf -s ours am: 2683d9d782 -s ours am: a48f918f95 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15936763
Change-Id: I6301fc28d943be25882033a5cdb54f88289aa17a
|
2021-09-29 17:44:03 +00:00 |
|
Bill Yi
|
370271467d
|
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: 75afb515a1 -s ours am: 56a79c9676 -s ours am: 06fbe9fb3f -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15935603
Change-Id: I99837ea5ea259a0cf1ba13d0a63790eeb99c9797
|
2021-09-29 17:43:57 +00:00 |
|
Bill Yi
|
69809d9481
|
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: b0cde68ecf -s ours am: 5fe5b29efd -s ours am: 8067d21b87 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15936763
Change-Id: I10dfea6cda653d95c59289975a645d0312714756
|
2021-09-29 17:43:20 +00:00 |
|
Bill Yi
|
ae44a26eff
|
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: 75afb515a1 -s ours am: de186d7ee7 -s ours am: 3504ff389f -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15935603
Change-Id: I130ac12edb63031c91276150f65ca0b51c7db4fe
|
2021-09-29 17:43:05 +00:00 |
|
Bill Yi
|
ee0f008f57
|
Merge changes from topic "presubmit-am-6290ab08962e4de2a1b7459b37584f7c" into sc-qpr1-dev am: 80474f4697 am: 4d1228138b
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15936763
Change-Id: I85a1aedfe02ecb446ff5de5516efb7d3f2e23246
|
2021-09-29 17:42:40 +00:00 |
|
Bill Yi
|
497e12bbff
|
[automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: d98d166893 am: 6f51b6d2bb -s ours am: 07b9fe79ad -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15936763
Change-Id: I91ee798d071c045b60ae80be9db2239092a5523a
|
2021-09-29 17:42:31 +00:00 |
|
Bill Yi
|
81360b89cf
|
Merge changes from topic "presubmit-am-299a8c0ab3d74eefa0a5487bc3c9a9c8" into sc-qpr1-dev am: 5d854dd46c am: 2dc674139d
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15935603
Change-Id: Ibbbe51f2487560e73aa3c7f621ef4e6f19f5a5ea
|
2021-09-29 17:41:25 +00:00 |
|
Bill Yi
|
dd02e2e5c1
|
[automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 0a8806d07d am: 62323d8c9f -s ours am: fe3dd2b7bb -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15935603
Change-Id: If406da45d694d56716e7b4dd5af1d20a4c38405d
|
2021-09-29 17:41:18 +00:00 |
|
Automerger Merge Worker
|
28330ef27e
|
Merge "[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: b0cde68ecf -s ours am: 5fe5b29efd -s ours am: 9dc35189b2 -s ours" into sc-v2-dev-plus-aosp
|
2021-09-29 17:38:09 +00:00 |
|
Automerger Merge Worker
|
e7d1d0337b
|
Merge changes from topic "am-cb1d008a7b8441849a404796a6ccff59" into sc-v2-dev-plus-aosp
* changes:
Merge changes from topic "presubmit-am-943e284c245b476c8b9d52d96160aedb" into sc-qpr1-dev am: 28dbc918b6 am: 99669a9da9
[automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 2f8fd51b76 am: d273e87d18 -s ours am: 00d5c23e54 -s ours
|
2021-09-29 17:38:08 +00:00 |
|
Bill Yi
|
d94a1a4233
|
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: b0cde68ecf -s ours am: 5fe5b29efd -s ours am: 9dc35189b2 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15936763
Change-Id: I071cafdd8ca17abc81f22cd86cdc32e551eccf64
|
2021-09-29 17:38:01 +00:00 |
|
Bill Yi
|
3b96353481
|
Merge changes from topic "presubmit-am-943e284c245b476c8b9d52d96160aedb" into sc-qpr1-dev am: 28dbc918b6 am: 99669a9da9
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15936311
Change-Id: I71f6a2f5168e0e7b7ce0f5e7590b1e1554c43956
|
2021-09-29 17:37:57 +00:00 |
|
Bill Yi
|
2d5c0c6791
|
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: 75afb515a1 -s ours am: de186d7ee7 -s ours am: 81c4852c32 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15935603
Change-Id: I3942c9d23995812147e04cd19d81ddc8c4c07f00
|
2021-09-29 17:37:48 +00:00 |
|
Bill Yi
|
bf3ee89843
|
[automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 2f8fd51b76 am: d273e87d18 -s ours am: 00d5c23e54 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15936311
Change-Id: I99f1c26aa022f43f42b050ae3f5bab9c380abcfc
|
2021-09-29 17:37:45 +00:00 |
|
Bill Yi
|
ddb21da21a
|
Merge changes from topic "presubmit-am-6290ab08962e4de2a1b7459b37584f7c" into sc-qpr1-dev am: 80474f4697 am: 43e941e458
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15936763
Change-Id: Ib12893027b21b67faa5952064e4708eb23e4c1f4
|
2021-09-29 17:37:31 +00:00 |
|
Bill Yi
|
e609a96ade
|
[automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: d98d166893 am: 6f51b6d2bb -s ours am: 06a0e04a71 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15936763
Change-Id: Ib1e013e15ef6801b636ab270278454b9b81ddd08
|
2021-09-29 17:37:25 +00:00 |
|
Bill Yi
|
b8c756b993
|
Merge changes from topic "presubmit-am-299a8c0ab3d74eefa0a5487bc3c9a9c8" into sc-qpr1-dev am: 5d854dd46c am: b3d5341c6e
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15935603
Change-Id: I012ce05d574bd68d911853ef059e96d3f284b396
|
2021-09-29 17:36:42 +00:00 |
|
Bill Yi
|
a05b13a716
|
[automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 0a8806d07d am: 62323d8c9f -s ours am: e29dd3284c -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15935603
Change-Id: I83c47f2d7fcf7cefc892c2ed0d07f97a8bc735e2
|
2021-09-29 17:36:33 +00:00 |
|
Bill Yi
|
0ad612d397
|
Merge changes from topic "presubmit-am-943e284c245b476c8b9d52d96160aedb" into sc-qpr1-dev am: 28dbc918b6 am: 7a81b7d5b6
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15936311
Change-Id: Ib836014a1030b977aedd284eb8f7ebe6caf0dd2e
|
2021-09-29 17:35:24 +00:00 |
|