Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
765,941 Commits 3 Branches 0 Tags
cc0f263dbbaddebeca6ee54d2b1e2b62f58be06a
Commit Graph

765941 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Alex Buynytskyy
cc0f263dbb Merge "Addressing CL feedback." into tm-dev am: 4ced90c38a am: 5c1235ccfa 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18339383

Change-Id: I0c20ba631493ea872315d0ee9f15049b22116de1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-12 22:44:49 +00:00
Winson Chiu
e0384a7707 Merge changes I78cd6a32,I99656d57 into tm-dev am: c16c6a2a78 am: 943891c264 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18351504

Change-Id: I90c60ef8947ebf5321b301c07a1a75fc78d9ed69
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-12 22:44:41 +00:00
Miranda Kephart
2ef7552e7d Merge "Ignore repeated dismissals for clipboard" into tm-dev am: 3ffed0bca8 am: 46606acb79 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18349555

Change-Id: I4c8b03a33fb6b91ac8557659d6bf12c53092b478
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-12 22:44:12 +00:00
Jing Ji
99696f503d Merge "Always construct the UidProcessState instance in ProcessStats" into tm-dev am: 317e43a1ff am: 5a27a4d23a 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18331909

Change-Id: I7ef99e88c6513be367fc4701762c0628b700cfe5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-12 22:43:55 +00:00
TreeHugger Robot
767b06cdfb Merge "Crash invalid FGS notifications" into rvc-dev am: 97fc7b179e am: afc2de4708 am: c85f627e2b am: 005285a1ae am: e6b1e10c96 am: 2bdaacec70 am: e6ca73a1a4 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17864680

Change-Id: I5af49de18a862e2f884c814867cf63b322263716
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-12 22:43:04 +00:00
TreeHugger Robot
ae7bf8fc6b Merge "Crash invalid FGS notifications" into rvc-qpr-dev am: e91ae52a85 am: 67d1edb349 am: 33a1ce86ec am: 3953a6a498 am: 44ffcf545b am: de66f395af 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17865553

Change-Id: Ib26da588b3ceace7959ebe0d6a8ef6c97849644d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-12 22:42:38 +00:00
TreeHugger Robot
67af27beca [automerger skipped] [conflict] Merge "Update ServiceState broadcast for location permissions" into sc-dev am: 0d2e7006ce am: 547648c23c -s ours am: a2c2b98770 -s ours am: d6dffa9fed -s ours am: ad2a229fbf -s ours 
am skip reason: Merged-In I9784527d6d79235830f562c1944562f5a6ac1fb3 with SHA-1 ac5f03c07f is already in history

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

Change-Id: I880143c866c0f0d4b5c618f06017e70b509876a1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-12 22:42:09 +00:00
Shaowei Shen
5aec35e0dc Merge "[Output Switcher] Not using advanced icon for bt device" into tm-dev am: 9c87ea6261 am: 4d48cced80 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18309447

Change-Id: Ibbfab54f3e962034e4ff7a89e75189675d709300
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-12 22:41:53 +00:00
Alex Buynytskyy
5c1235ccfa Merge "Addressing CL feedback." into tm-dev am: 4ced90c38a 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18339383

Change-Id: I757095c385aefc67905c47c2fe7cec47cdce2ebd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-12 22:40:58 +00:00
Winson Chiu
943891c264 Merge changes I78cd6a32,I99656d57 into tm-dev am: c16c6a2a78 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18351504

Change-Id: Ie316b8cc2a26f17a6c50f07e9639ec523b05d69d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-12 22:40:07 +00:00
Alex Buynytskyy
4ced90c38a Merge "Addressing CL feedback." into tm-dev 2022-05-12 22:35:36 +00:00
Winson Chiu
c16c6a2a78 Merge changes I78cd6a32,I99656d57 into tm-dev 
* changes:
  Fix PMS recordInitialState on retry
  Avoid taking PMS snapshot lock when snapshot is still valid
 2022-05-12 22:33:45 +00:00
Miranda Kephart
46606acb79 Merge "Ignore repeated dismissals for clipboard" into tm-dev am: 3ffed0bca8 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18349555

Change-Id: I8d93200c2a46257a113ed49704cc8147278ae2d0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-12 22:23:31 +00:00
Jing Ji
5a27a4d23a Merge "Always construct the UidProcessState instance in ProcessStats" into tm-dev am: 317e43a1ff 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18331909

Change-Id: I03d5fb37cf0c2a29b0cf58eb3546265b66740542
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-12 22:22:34 +00:00
Miranda Kephart
3ffed0bca8 Merge "Ignore repeated dismissals for clipboard" into tm-dev 2022-05-12 22:16:33 +00:00
Jing Ji
317e43a1ff Merge "Always construct the UidProcessState instance in ProcessStats" into tm-dev 2022-05-12 22:15:18 +00:00
TreeHugger Robot
e6ca73a1a4 Merge "Crash invalid FGS notifications" into rvc-dev am: 97fc7b179e am: afc2de4708 am: c85f627e2b am: 005285a1ae am: e6b1e10c96 am: 2bdaacec70 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17864680

Change-Id: I1da1adde014722f00877fe321776d15380941e0d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-12 22:14:38 +00:00
TreeHugger Robot
de66f395af Merge "Crash invalid FGS notifications" into rvc-qpr-dev am: e91ae52a85 am: 67d1edb349 am: 33a1ce86ec am: 3953a6a498 am: 44ffcf545b 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17865553

Change-Id: I75699b7c6fc620439511cf4bcbbc4de5c48e2fec
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-12 22:14:23 +00:00
TreeHugger Robot
2bdaacec70 Merge "Crash invalid FGS notifications" into rvc-dev am: 97fc7b179e am: afc2de4708 am: c85f627e2b am: 005285a1ae am: e6b1e10c96 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17864680

Change-Id: Ic9d51a83b6dba513d5b1ff740ec1834cd02fa19f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-12 22:06:25 +00:00
TreeHugger Robot
ad2a229fbf [automerger skipped] [conflict] Merge "Update ServiceState broadcast for location permissions" into sc-dev am: 0d2e7006ce am: 547648c23c -s ours am: a2c2b98770 -s ours am: d6dffa9fed -s ours 
am skip reason: Merged-In I9784527d6d79235830f562c1944562f5a6ac1fb3 with SHA-1 ac5f03c07f is already in history

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

Change-Id: I34a9e084199ac8dcff245a39c5d107e096ff3f3f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-12 22:05:58 +00:00
Shaowei Shen
4d48cced80 Merge "[Output Switcher] Not using advanced icon for bt device" into tm-dev am: 9c87ea6261 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18309447

Change-Id: Iec442037b978db0e48f6eddb2bc580267c916a5b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-12 22:05:51 +00:00
TreeHugger Robot
44ffcf545b Merge "Crash invalid FGS notifications" into rvc-qpr-dev am: e91ae52a85 am: 67d1edb349 am: 33a1ce86ec am: 3953a6a498 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17865553

Change-Id: I83e6eb952dac0bd995eaf3ef2d3d1387adbbb0c7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-12 22:05:45 +00:00
TreeHugger Robot
d6dffa9fed [automerger skipped] [conflict] Merge "Update ServiceState broadcast for location permissions" into sc-dev am: 0d2e7006ce am: 547648c23c -s ours am: a2c2b98770 -s ours 
am skip reason: Merged-In I9784527d6d79235830f562c1944562f5a6ac1fb3 with SHA-1 ac5f03c07f is already in history

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

Change-Id: I62b24fc8c5e95139ae7e205f17fce5a8ff4dac3d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-12 22:05:04 +00:00
Shaowei Shen
9c87ea6261 Merge "[Output Switcher] Not using advanced icon for bt device" into tm-dev 2022-05-12 21:59:18 +00:00
Treehugger Robot
adc72ff3fa [automerger skipped] Merge "Add new MMS result codes" am: fe5f242360 am: 037b772f40 -s ours am: 1e562e051a -s ours 
am skip reason: Merged-In I190345240482437289d26101857d805cf06e0341 with SHA-1 88533afb72 is already in history

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

Change-Id: Id8a5c3f8c0ccd18c36088658c783c6e40727a8c1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-12 21:51:12 +00:00
Hasini Gunasinghe
43f574e7fe Merge "Update the StatsPullAtomsService to accommodate RkpErrorStats." into tm-dev am: 54c3414ab9 am: d5d520f5e2 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18350707

Change-Id: I5bf8a1f3caebdae89352be76b66e2d680b466dda
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-12 21:50:37 +00:00
Hasini Gunasinghe
8ca66b499e Merge "Update the StatsPullAtomsService to accommodate RkpErrorStats." into tm-dev am: 54c3414ab9 am: 106d0442aa 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18350707

Change-Id: I612407f35d9da41ace059be4c1910f877373ad84
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-12 21:50:28 +00:00
TreeHugger Robot
b4d79a358a Merge "[Media] Add logs for potential memory leaks in MediaCarouselController." into tm-dev am: eccd61221b am: 5939439fa5 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18320596

Change-Id: I2e97e44ec35395c8698e9a1a67bf825daafbbc14
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-12 21:50:04 +00:00
TreeHugger Robot
bc8afc2b5f Merge "[Media] Add logs for potential memory leaks in MediaCarouselController." into tm-dev am: eccd61221b am: 7e085870ef 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18320596

Change-Id: I9f74b3ecb2788686779cda7d2390a7e739b162a2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-12 21:49:31 +00:00
Mark Renouf
4ea4fe492b Use System.nanoTime(), avoid desyncing frame times am: 7ab7a81845 am: c63c33319c 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18322679

Change-Id: Iba4caf6e763ee34fee19ec7d7806a4c21a3eac7c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-12 21:49:19 +00:00
Mark Renouf
f5ec35d355 Use System.nanoTime(), avoid desyncing frame times am: 7ab7a81845 am: fcb64ad8cd 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18322679

Change-Id: I47607a23ed46a4a26d879694bbf98404996bac77
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-12 21:49:14 +00:00
TreeHugger Robot
7c3ecf3725 Merge "Keystore: Wire X25519 key agreement" into tm-dev am: 1c0a4f1cee am: ccf62fa523 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18280945

Change-Id: Ia41ec35e070acdaf7fbcc838bbc3ac7d4138aa0a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-12 21:49:04 +00:00
Treehugger Robot
1e562e051a [automerger skipped] Merge "Add new MMS result codes" am: fe5f242360 am: 037b772f40 -s ours 
am skip reason: Merged-In I190345240482437289d26101857d805cf06e0341 with SHA-1 88533afb72 is already in history

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

Change-Id: Ib6595516fed152c19f5bcd49a66c575221e2c7e0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-12 21:49:03 +00:00
TreeHugger Robot
cd1ecd655f Merge "Keystore: Wire X25519 key agreement" into tm-dev am: 1c0a4f1cee am: dbc4b98314 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18280945

Change-Id: Ie80243102aa9ba6fb0758e6c2c2ea74e2a155c4d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-12 21:48:49 +00:00
Hasini Gunasinghe
d5d520f5e2 Merge "Update the StatsPullAtomsService to accommodate RkpErrorStats." into tm-dev am: 54c3414ab9 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18350707

Change-Id: Ia7608217b582107337dd2ffef898399360ae9479
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-12 21:48:05 +00:00
Hasini Gunasinghe
106d0442aa Merge "Update the StatsPullAtomsService to accommodate RkpErrorStats." into tm-dev am: 54c3414ab9 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18350707

Change-Id: I5f813c6d9ca9f44197a275a4a7502b2de3684a16
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-12 21:40:31 +00:00
TreeHugger Robot
e6b1e10c96 Merge "Crash invalid FGS notifications" into rvc-dev am: 97fc7b179e am: afc2de4708 am: c85f627e2b am: 005285a1ae 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17864680

Change-Id: Ic9587032c75cc94a783e5b0c7dcb67143b2bf808
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-12 21:39:48 +00:00
TreeHugger Robot
3953a6a498 Merge "Crash invalid FGS notifications" into rvc-qpr-dev am: e91ae52a85 am: 67d1edb349 am: 33a1ce86ec 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17865553

Change-Id: I32bede8e58566632e5eccb62f4e98e458b9b8158
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-12 21:39:34 +00:00
TreeHugger Robot
a2c2b98770 [automerger skipped] [conflict] Merge "Update ServiceState broadcast for location permissions" into sc-dev am: 0d2e7006ce am: 547648c23c -s ours 
am skip reason: Merged-In I9784527d6d79235830f562c1944562f5a6ac1fb3 with SHA-1 ac5f03c07f is already in history

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

Change-Id: Idc41ebe7f73e96b9da99c88be7a1fc3b9a6ac0fa
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-12 21:39:10 +00:00
Hasini Gunasinghe
54c3414ab9 Merge "Update the StatsPullAtomsService to accommodate RkpErrorStats." into tm-dev 2022-05-12 21:34:14 +00:00
TreeHugger Robot
7e085870ef Merge "[Media] Add logs for potential memory leaks in MediaCarouselController." into tm-dev am: eccd61221b 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18320596

Change-Id: If39fd14111ba7b1e5beb63371faa469116100a75
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-12 21:30:12 +00:00
TreeHugger Robot
5939439fa5 Merge "[Media] Add logs for potential memory leaks in MediaCarouselController." into tm-dev am: eccd61221b 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18320596

Change-Id: I719e1ad87f3fdd990e649add11449ff1b6a44bf1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-12 21:28:30 +00:00
TreeHugger Robot
eccd61221b Merge "[Media] Add logs for potential memory leaks in MediaCarouselController." into tm-dev 2022-05-12 21:23:42 +00:00
Mark Renouf
fcb64ad8cd Use System.nanoTime(), avoid desyncing frame times am: 7ab7a81845 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18322679

Change-Id: I6c21c5783d30f1c19961582b66000cb4f49ebc26
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-12 21:22:01 +00:00
TreeHugger Robot
ccf62fa523 Merge "Keystore: Wire X25519 key agreement" into tm-dev am: 1c0a4f1cee 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18280945

Change-Id: Ic00928a20edcd2c2231ff3ed08770d8571b8c953
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-12 21:20:02 +00:00
Mark Renouf
c63c33319c Use System.nanoTime(), avoid desyncing frame times am: 7ab7a81845 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18322679

Change-Id: If4b00215b2308dc568dfb494955392d14cd87023
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-12 21:19:14 +00:00
TreeHugger Robot
dbc4b98314 Merge "Keystore: Wire X25519 key agreement" into tm-dev am: 1c0a4f1cee 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18280945

Change-Id: I0a5663050f78bec2542952526e63c22d4d4a1307
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-12 21:18:28 +00:00
TreeHugger Robot
005285a1ae Merge "Crash invalid FGS notifications" into rvc-dev am: 97fc7b179e am: afc2de4708 am: c85f627e2b 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17864680

Change-Id: I5fa5de00bbc0e2301ebdc15c1405f8f01e25b416
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-12 21:12:02 +00:00
Treehugger Robot
037b772f40 Merge "Add new MMS result codes" am: fe5f242360 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2097353

Change-Id: I3c17b4f6397b9200da4eacd258670f2ab56e31a6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-12 21:11:12 +00:00
TreeHugger Robot
33a1ce86ec Merge "Crash invalid FGS notifications" into rvc-qpr-dev am: e91ae52a85 am: 67d1edb349 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17865553

Change-Id: I7e3587b877ad26e34b50448d4714753deefab842
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-12 21:10:59 +00:00