Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
701,663 Commits 3 Branches 0 Tags
c0719ec673665e01cbae5bcfb79ad850d8a0ee7c
Commit Graph

701663 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Treehugger Robot
c0719ec673 Merge "HDMICEC: Add equals test for CodecSad" am: 2c677b190d am: f2ba048e8a am: 79d21ae37a am: 1f0062eb9f 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1489238

Change-Id: I781ff66c51bbbf4ec0b4aa0f5ea7325b30cd3463
 2021-07-16 15:06:18 +00:00
Treehugger Robot
1f0062eb9f Merge "HDMICEC: Add equals test for CodecSad" am: 2c677b190d am: f2ba048e8a am: 79d21ae37a 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1489238

Change-Id: I2946a49b3b4d92974d5b9d7c15a9a7015549e26c
 2021-07-16 14:49:06 +00:00
Treehugger Robot
79d21ae37a Merge "HDMICEC: Add equals test for CodecSad" am: 2c677b190d am: f2ba048e8a 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1489238

Change-Id: I983e14ff0a8b67b41ffda5d56db04e924a1ec67c
 2021-07-16 14:35:55 +00:00
Thales Lima
40e0f1de65 Merge "sysui: show security footer on the bottom when in split shade mode" into sc-v2-dev am: 69635bde10 am: 7742083cc3 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14937208

Change-Id: Ia1b6239ec4fba4ae21741278796266e74a314e28
 2021-07-16 14:35:21 +00:00
Treehugger Robot
f2ba048e8a Merge "HDMICEC: Add equals test for CodecSad" am: 2c677b190d 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1489238

Change-Id: I34ab813644a4f40e36218b0574091bd6d19dd893
 2021-07-16 14:19:06 +00:00
Thales Lima
7742083cc3 Merge "sysui: show security footer on the bottom when in split shade mode" into sc-v2-dev am: 69635bde10 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14937208

Change-Id: Ia998d8380f055c55efaabf0529bdfd21d0b5cca9
 2021-07-16 14:17:52 +00:00
Thales Lima
69635bde10 Merge "sysui: show security footer on the bottom when in split shade mode" into sc-v2-dev 2021-07-16 14:04:38 +00:00
Treehugger Robot
2c677b190d Merge "HDMICEC: Add equals test for CodecSad" 2021-07-16 14:03:32 +00:00
Kalesh Singh
9a7939872a [automerger skipped] Merge "Add API to get GPU private memory" am: e84ebfc0fc am: b5e1145b17 -s ours am: e24ed745d8 -s ours am: 79cea55ce4 -s ours 
am skip reason: Merged-In Ib90505ec184339d5acbcd42c67dad3ad65dbd933 with SHA-1 c6deb0fd9d is already in history

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

Change-Id: I9c383787548eda6bfb26cda6742b74da9e9c786e
 2021-07-16 13:59:52 +00:00
Kalesh Singh
79cea55ce4 [automerger skipped] Merge "Add API to get GPU private memory" am: e84ebfc0fc am: b5e1145b17 -s ours am: e24ed745d8 -s ours 
am skip reason: Merged-In Ib90505ec184339d5acbcd42c67dad3ad65dbd933 with SHA-1 c6deb0fd9d is already in history

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

Change-Id: Id7f54e5e4711539d7b1b4a51aee44f5e1004ecbd
 2021-07-16 13:44:57 +00:00
Kalesh Singh
e24ed745d8 [automerger skipped] Merge "Add API to get GPU private memory" am: e84ebfc0fc am: b5e1145b17 -s ours 
am skip reason: Merged-In Ib90505ec184339d5acbcd42c67dad3ad65dbd933 with SHA-1 c6deb0fd9d is already in history

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

Change-Id: I3573eca5d7a958344bfadf210832e36d1de687c6
 2021-07-16 13:27:33 +00:00
Kalesh Singh
b5e1145b17 Merge "Add API to get GPU private memory" am: e84ebfc0fc 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1764047

Change-Id: Id2f283abf8cb2c06b1aaec7ee7723e063f03ee5f
 2021-07-16 13:09:37 +00:00
Jerry Chang
7be5b9d5c5 Merge "Fix navigation bar icon color is not optimized for a dimming dialog" into sc-v2-dev am: eae31f517e am: 5f379bef3a 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15301167

Change-Id: I1f48056149e903706bfb1e096f18562d4bfc1981
 2021-07-16 13:09:24 +00:00
Treehugger Robot
87d584ce12 Merge "Add a lock for call add/remove operations to avoid ConcurrentModificationException." am: 584003dd0d am: cb477fc498 am: d6217b06d8 am: ae946847f8 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1768612

Change-Id: I5751e51fabaace6826fbd4b48a70bcc7808bb54c
 2021-07-16 13:08:45 +00:00
Jerry Chang
5f379bef3a Merge "Fix navigation bar icon color is not optimized for a dimming dialog" into sc-v2-dev am: eae31f517e 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15301167

Change-Id: I1557d865dc30ac5e57e4dc5ad7921829b354329d
 2021-07-16 12:59:32 +00:00
Kalesh Singh
e84ebfc0fc Merge "Add API to get GPU private memory" 2021-07-16 12:57:49 +00:00
Treehugger Robot
ae946847f8 Merge "Add a lock for call add/remove operations to avoid ConcurrentModificationException." am: 584003dd0d am: cb477fc498 am: d6217b06d8 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1768612

Change-Id: Ie4e5c752570ac7181b81a6d1d49e2cfbf2769b0f
 2021-07-16 12:55:51 +00:00
Jerry Chang
eae31f517e Merge "Fix navigation bar icon color is not optimized for a dimming dialog" into sc-v2-dev 2021-07-16 12:48:22 +00:00
Treehugger Robot
d6217b06d8 Merge "Add a lock for call add/remove operations to avoid ConcurrentModificationException." am: 584003dd0d am: cb477fc498 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1768612

Change-Id: Icf9b0cbb36422f725a8808f771dca7a45df68e0d
 2021-07-16 12:39:23 +00:00
Venkatarama NG. Avadhani
981814f10c HDMICEC: Add equals test for CodecSad 
Add equals test for nested class class CodecSad in HdmiUtils.

Bug: 168713324
Test: atest HdmiUtilsTest#testEqualsCodecSad
Change-Id: I5991629458ef06d9feaabec55f85c0f88368b301
Merged-In: I5991629458ef06d9feaabec55f85c0f88368b301
 2021-07-16 12:39:18 +00:00
Treehugger Robot
cb477fc498 Merge "Add a lock for call add/remove operations to avoid ConcurrentModificationException." am: 584003dd0d 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1768612

Change-Id: I189d728ae8f385f82bb66d244dac37f02f2edf42
 2021-07-16 12:20:49 +00:00
Treehugger Robot
584003dd0d Merge "Add a lock for call add/remove operations to avoid ConcurrentModificationException." 2021-07-16 12:05:52 +00:00
Antoan Angelov
3294ddb241 Merge "Transform NFC Intent to provisioning Intent" 2021-07-16 11:39:24 +00:00
Thales Lima
fc546a96c4 sysui: show security footer on the bottom when in split shade mode 
When showing the notification shade in split mode, the security footer
should always be shown after the footer. This also updates resources to
have a best usage of configs and dimensions.

Fixes: 188906516
Test: Added tests to QSPanelTest
Change-Id: Iea29490aa73bc4fb3fe3cce82e181a22adca2937
 2021-07-16 11:48:32 +01:00
Automerger Merge Worker
e39c36c1ea [automerger skipped] Merge "Merge "Make AudioManager.getReportedSurroundFormats a TestApi" into sc-dev am: 0077afd88a am: 4559e5b9d5" into sc-v2-dev-plus-aosp am: 3fe8ec2b91 -s ours 
am skip reason: Merged-In If6287743f57b77d0eb2639e4a2e9409c7d778f06 with SHA-1 00e49c1482 is already in history

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

Change-Id: Ic3c1dcb8e1d2e5a5863dbafe46024b20dfa1c7e2
 2021-07-16 08:51:41 +00:00
Kriti Dang
de37636607 [automerger skipped] Merge "Make AudioManager.getReportedSurroundFormats a TestApi" into sc-dev am: 0077afd88a am: b4630c8743 am: 832742e028 -s ours 
am skip reason: Merged-In If6287743f57b77d0eb2639e4a2e9409c7d778f06 with SHA-1 00e49c1482 is already in history

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

Change-Id: I35c971192c4a27225ab98e14c9456adcf233ca9a
 2021-07-16 08:51:10 +00:00
Automerger Merge Worker
3fe8ec2b91 Merge "Merge "Make AudioManager.getReportedSurroundFormats a TestApi" into sc-dev am: 0077afd88a am: 4559e5b9d5" into sc-v2-dev-plus-aosp 2021-07-16 08:34:24 +00:00
Kriti Dang
832742e028 Merge "Make AudioManager.getReportedSurroundFormats a TestApi" into sc-dev am: 0077afd88a am: b4630c8743 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14840460

Change-Id: I5b2506d77e9d481fa698b5f710007b861127b4dd
 2021-07-16 08:33:48 +00:00
Kriti Dang
cdb79a4bf2 Merge "Make AudioManager.getReportedSurroundFormats a TestApi" into sc-dev am: 0077afd88a am: 4559e5b9d5 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14840460

Change-Id: I74f6a1abaf78284846126f333d606f09b6608848
 2021-07-16 08:33:41 +00:00
Kriti Dang
09186acb1e [automerger skipped] Merge "Make AudioManager.getReportedSurroundFormats a TestApi" into sc-dev am: 0077afd88a am: 1d0ae7a171 -s ours 
am skip reason: Merged-In If6287743f57b77d0eb2639e4a2e9409c7d778f06 with SHA-1 1380c0e845 is already in history

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

Change-Id: Ibe5993550f0a12c2cf180f3d559fa50419a3afac
 2021-07-16 08:33:03 +00:00
Kriti Dang
b4630c8743 Merge "Make AudioManager.getReportedSurroundFormats a TestApi" into sc-dev am: 0077afd88a 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14840460

Change-Id: Ie9d1c4e039ce547eca7f3e427fa80a6fc08a963d
 2021-07-16 08:16:33 +00:00
Kriti Dang
4559e5b9d5 Merge "Make AudioManager.getReportedSurroundFormats a TestApi" into sc-dev am: 0077afd88a 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14840460

Change-Id: I9ae1460e47528ffb38d00ed85a259d9e2e5077b6
 2021-07-16 08:15:41 +00:00
Kriti Dang
1d0ae7a171 Merge "Make AudioManager.getReportedSurroundFormats a TestApi" into sc-dev am: 0077afd88a 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14840460

Change-Id: I4e2da37ebe4ae3670d9e9557846058b0ae86cb66
 2021-07-16 08:14:53 +00:00
Jerry Chang
46aabaa06e Fix navigation bar icon color is not optimized for a dimming dialog 
Bug: 193825236
Test: test passed on forrest
Change-Id: Ia898847d3eccc6408c6c77a56e0a935d694316fe
 2021-07-16 08:05:21 +00:00
Kriti Dang
0077afd88a Merge "Make AudioManager.getReportedSurroundFormats a TestApi" into sc-dev 2021-07-16 08:03:05 +00:00
Chris Li
8e9e03c558 Merge "Clean up previous DA organizer when registering" into sc-dev am: e032c8face am: fa3e41dd25 am: ea2068563c 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15106415

Change-Id: Ib427ac252efb72506b489ec7dde42132bd27f559
 2021-07-16 07:39:57 +00:00
Chris Li
310b7a82bc Merge "Clean up previous DA organizer when registering" into sc-dev am: e032c8face am: aa35c3d407 am: 84fc8046af 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15106415

Change-Id: I25a770349fd02f3c846209ea3d139c8baa0ac6b7
 2021-07-16 07:39:31 +00:00
Chris Li
ea2068563c Merge "Clean up previous DA organizer when registering" into sc-dev am: e032c8face am: fa3e41dd25 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15106415

Change-Id: If7508ec642a2e9950b64ed57b20b85408171e15c
 2021-07-16 07:28:21 +00:00
Chris Li
84fc8046af Merge "Clean up previous DA organizer when registering" into sc-dev am: e032c8face am: aa35c3d407 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15106415

Change-Id: I5a3e2fe1bf75196a579552c33d858831b7de8b5f
 2021-07-16 07:27:55 +00:00
Chris Li
66a80d74bd Merge "Clean up previous DA organizer when registering" into sc-dev am: e032c8face am: 815d2275f0 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15106415

Change-Id: I6e1cfae269acf123ee2c1ce169e29dbf91f596ac
 2021-07-16 07:27:29 +00:00
Chris Li
0f958f85f1 Merge "Allow TaskFragmentOrganizer to apply WCT without permission" into sc-v2-dev am: 5849a2b5e3 am: b33c498d7d 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15264526

Change-Id: I1736e89cc0b6a6b82dda877725f5481107d56136
 2021-07-16 07:21:24 +00:00
Chris Li
aa35c3d407 Merge "Clean up previous DA organizer when registering" into sc-dev am: e032c8face 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15106415

Change-Id: Ibbd8d506f450fbe1c5cc337e95759cb8403e7d0e
 2021-07-16 07:16:26 +00:00
Chris Li
fa3e41dd25 Merge "Clean up previous DA organizer when registering" into sc-dev am: e032c8face 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15106415

Change-Id: Ifcafa406b33b534bcea0319437fa8d4be2e1f233
 2021-07-16 07:16:05 +00:00
Chris Li
815d2275f0 Merge "Clean up previous DA organizer when registering" into sc-dev am: e032c8face 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15106415

Change-Id: Ibd63361dd78374cfb61187549a3d5cff03e1aebf
 2021-07-16 07:15:36 +00:00
Chris Li
b33c498d7d Merge "Allow TaskFragmentOrganizer to apply WCT without permission" into sc-v2-dev am: 5849a2b5e3 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15264526

Change-Id: I8a431df7d6fb2004df6e32571fb08ce474a9cd92
 2021-07-16 07:03:22 +00:00
Chris Li
e032c8face Merge "Clean up previous DA organizer when registering" into sc-dev 2021-07-16 06:53:18 +00:00
Chris Li
5849a2b5e3 Merge "Allow TaskFragmentOrganizer to apply WCT without permission" into sc-v2-dev 2021-07-16 06:50:53 +00:00
Tony Huang
764f04e410 Merge "Prevent having empty task added back into TDA" into sc-dev am: f4690485e1 am: 3e2af07fda am: fe6b10eb8e 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15298116

Change-Id: I61442800a62289a3d40a1195354198ef7534c280
 2021-07-16 06:26:01 +00:00
TreeHugger Robot
4ebadb0674 Merge "Make ImePerfTest wait for animation end" into sc-dev am: 28a77d5846 am: 29cd6f010f am: 3af53aa2c8 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15161272

Change-Id: I00ba4b20f28550d1519c66c927618ead07844b87
 2021-07-16 06:25:49 +00:00
Tony Huang
4c701ca7b9 Merge "Prevent having empty task added back into TDA" into sc-dev am: f4690485e1 am: 992c37ed9a am: 86cf9050d8 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15298116

Change-Id: Icf43e4897ce685a9151e83221ad8e2879e394f9d
 2021-07-16 06:25:22 +00:00