Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
667,234 Commits 3 Branches 0 Tags
71cb65c16a2f90455dd5324503eca327068506c0
Commit Graph

667234 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Ben Murdoch
71cb65c16a Merge "Default handed bouncer on for large screen devices." into sc-v2-dev am: 9bd2221ebc 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15684417

Change-Id: Ief506025a52400a98db154d82acd3bb35d5d53a6
 2021-08-27 10:47:02 +00:00
Songchun Fan
bce29d1b6f Merge "[lint] add owners to frameworks/base/tools/lint" am: 5834070338 am: 54a4e7a360 am: 0d12a65114 am: cd14c3cf76 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1809160

Change-Id: I6af518bca858eb2f3e0000614e64fd8ac320bdef
 2021-08-27 10:36:12 +00:00
Hui Yu
7f1cf1d238 [automerger skipped] Add canAllowWhileInUsePermissionInFgsLocked() method back. am: 94b62d998d -s ours am: 0a819742a3 -s ours am: f349224ae1 -s ours am: 8679229591 -s ours 
am skip reason: Merged-In Idc88f274c7a323d175d65bb47eca041772ae9bb7 with SHA-1 6706c1acc0 is already in history

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

Change-Id: I9312d0a843e1790dd3759b682d4740dbbf14e953
 2021-08-27 10:34:11 +00:00
Ben Murdoch
9bd2221ebc Merge "Default handed bouncer on for large screen devices." into sc-v2-dev 2021-08-27 10:33:55 +00:00
Hui Yu
430c697de2 [automerger skipped] Add canAllowWhileInUsePermissionInFgsLocked() method back. am: 94b62d998d -s ours am: 0a819742a3 -s ours am: dcce469e34 -s ours am: 4dbfdb8f84 -s ours 
am skip reason: Merged-In Idc88f274c7a323d175d65bb47eca041772ae9bb7 with SHA-1 6706c1acc0 is already in history

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

Change-Id: I29f5df2e727156dcf2386c46e909cdddb629ee7d
 2021-08-27 10:33:36 +00:00
Android Build Prod User
f5e9e5b4ad Merge "Always show "Swipe up to open" on tapping empty space on LS" into sc-qpr1-dev am: 374929be06 am: 5ff71c8e3b 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15675583

Change-Id: I6d40f0764a39a98c701a4f5aae8bb3586d53bc28
 2021-08-27 10:33:02 +00:00
Mohammad Samiul Islam
332347aa1c Merge changes from topic "compos-cherry-pick" into stage-aosp-master am: 9ade5e2ffb am: 631842eb58 am: 9dc21480ac 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15638982

Change-Id: I6b526d79ea5dc1c365be72b7dbf13fe4d7e27bcd
 2021-08-27 10:31:53 +00:00
Samiul Islam
9be2481700 Notify StagedApexObservers when there is a change in set of staged APEX am: fe58e6f7d1 am: 9178f580b5 am: 2b0afa2aec 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15638981

Change-Id: Id272f9a3fd426446f4de5920d3944367efea2af0
 2021-08-27 10:31:38 +00:00
Samiul Islam
aaba942773 Open up new API in StagingManager to get information about staged APEX am: 9f80efac39 am: 7e59235ab9 am: b15c258042 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15638980

Change-Id: I9b90c82900435e975c8f41f3e11ee333defddd28
 2021-08-27 10:31:35 +00:00
Samiul Islam
20e7ecccb4 Connect the new API from ApexService to ApexManager am: 3d8b82ca08 am: a2a902f58d am: 9b1d330fef 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15624279

Change-Id: Ie6b0176abde822f21d1534804c7411ebf654cd82
 2021-08-27 10:31:20 +00:00
Shan Huang
147f668a41 Merge "Support rendering white pixels." into sc-qpr1-dev am: e2f4ad3e7b am: 5c7503cb06 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15676845

Change-Id: Ibe3d6ba56c725c3e4170d1cd33e074345bf101a2
 2021-08-27 10:28:15 +00:00
Hui Yu
5f2749003f [automerger skipped] Merge "Revert "BG-FGS-start while-in-use permission restriction improve..."" into rvc-dev am: 63bab23a9d am: 2162cfd39b -s ours am: 8333d75972 -s ours am: e8396bc4a6 -s ours am: 5e7b4f5935 -s ours 
am skip reason: Merged-In Idc88f274c7a323d175d65bb47eca041772ae9bb7 with SHA-1 6706c1acc0 is already in history. Merged-In was found from reverted change.

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

Change-Id: Iffaaea3c3b8e458f695b2b0073c69c6bc7a01954
 2021-08-27 10:27:38 +00:00
Automerger Merge Worker
3e90dfe423 Merge "[automerger skipped] Merge "Revert "BG-FGS-start while-in-use permission restriction improve..."" into rvc-dev am: 63bab23a9d am: 4a9a5f59c8 -s ours am: 7aaecba06a -s ours am: 387bc6cb32 -s ours" into sc-qpr1-dev-plus-aosp am: 9fdc373ceb -s ours 
am skip reason: Merged-In Idc88f274c7a323d175d65bb47eca041772ae9bb7 with SHA-1 6706c1acc0 is already in history. Merged-In was found from reverted change.

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

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

Change-Id: Ib877dbae7e1c994917ac62a69a471fa6e6bc7eb4
 2021-08-27 10:27:28 +00:00
Hui Yu
9d3551d9f8 [automerger skipped] Merge "Revert "BG-FGS-start while-in-use permission restriction improve..."" into rvc-dev am: 63bab23a9d am: 2162cfd39b -s ours am: 8333d75972 -s ours am: b0aa3ec6d8 -s ours am: ffd704c4bb -s ours 
am skip reason: Merged-In Idc88f274c7a323d175d65bb47eca041772ae9bb7 with SHA-1 6706c1acc0 is already in history. Merged-In was found from reverted change.

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

Change-Id: I68c8cb01f6c9ce68ef5f4a91e6f0a0684cb13b10
 2021-08-27 10:26:51 +00:00
Hui Yu
2f9926b812 [automerger skipped] Merge "Revert "BG-FGS-start while-in-use permission restriction improve..."" into rvc-dev am: 63bab23a9d am: 4a9a5f59c8 -s ours am: 7aaecba06a -s ours am: ceb2878d87 -s ours am: 3e6785263d -s ours 
am skip reason: Merged-In Idc88f274c7a323d175d65bb47eca041772ae9bb7 with SHA-1 6706c1acc0 is already in history. Merged-In was found from reverted change.

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

Change-Id: I4cb5bf578f3acdfa4785cf73b6b97395763b5bfe
 2021-08-27 10:26:09 +00:00
Julia Reynolds
bb963602f1 Merge "Fix behavior of updates to insistent notifs" into sc-qpr1-dev am: 5bda39799d am: 15300d595b 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15676601

Change-Id: Ia2198a7e555c0345d2ddf6904a3db9b92169fe2c
 2021-08-27 10:18:49 +00:00
Jooyung Han
5c5e7c9bdc [automerger skipped] Merge "devicepolicy: use typed List<String> in AIDL" into stage-aosp-master am: 0c08393bf9 -s ours am: 490fe9dbb8 -s ours am: d8b6e839fd -s ours 
am skip reason: Merged-In I0ea1c35f7ce4dd6f6bde02874e02ed190fa2e904 with SHA-1 57fe5105df is already in history

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

Change-Id: I2f768fe62e37e677a4ceb188e7f1d93b844da8a2
 2021-08-27 10:18:38 +00:00
Android Build Prod User
d58ac5c6f2 Merge "Remove ZigZagClassifer from lock-icon longpress falsing algo" into sc-qpr1-dev am: 1751bd89f1 am: bed33a5ba0 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15685188

Change-Id: Iaa5e7cc4e6b4ba448c07978a21a6988b916ffeb6
 2021-08-27 10:18:15 +00:00
Android Build Prod User
41a9510de7 Merge "Mutate the drawable when updating QS icon." into sc-qpr1-dev am: 590dc710e8 am: acabbde4aa 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15668772

Change-Id: Ifd7068e067938e75d9aa91afc837fbbd35188ce6
 2021-08-27 10:18:01 +00:00
Orion Hodson
28e0b469a7 Merge "Drop system_server dexopt in ZygoteInit" am: 5e1c9fe7fc am: b55a7938a6 am: f08df3a589 am: 868634f0bb 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1806016

Change-Id: I44175a103e3bb36c38c7a82eec4a8f43cb562d3d
 2021-08-27 10:17:23 +00:00
Julia Reynolds
887644ca25 Merge "Check user when snoozing" into sc-qpr1-dev am: b082cf64e1 am: 3a6edb1f89 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15676600

Change-Id: Id29a08ec990f1b195c887f6b8507251a4f614a71
 2021-08-27 10:16:37 +00:00
vichang
0c3834e1bd Merge "Regenerate LocaleDataTables.cpp due to ICU 69 upgrade" am: 0c58210d59 am: adf183e252 am: 348d460d5f am: 87a4ecdd40 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1802436

Change-Id: Iaef44f0334b4fbb68580bbd00494b02cea790b7d
 2021-08-27 10:15:57 +00:00
Jooyung Han
702831cc66 Merge "telephony: suppress warnings in AIDL" am: 6dff9dce0f am: 7c15aa4254 am: 43fa5417b7 am: 8643edb8f2 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1808127

Change-Id: Ie03c2f7d6c3c73fcfa3f2cbb69d4f19fc354def8
 2021-08-27 10:15:35 +00:00
Android Build Prod User
0e1d655a58 Merge "Initial udfps vibration should always play" into sc-qpr1-dev am: 8b5f287dcb am: a47760e1a2 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15675980

Change-Id: I801f4247c337208c38df1a49e04592dcef8e32ff
 2021-08-27 10:15:14 +00:00
Michał Brzeziński
cdc2d39c67 Merge "Fixing QS reacting to touches in notifications area in split shade" into sc-v2-dev am: df844e0c3a 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15675160

Change-Id: I271c0f59fb1aa2f3cb9a5e7ab249e2dfc2160121
 2021-08-27 10:14:46 +00:00
Pierre Barbier de Reuille
a8b72c6cd7 Merge "Accounting for image scaling when calculating color extraction" into sc-qpr1-dev am: 64b885a4f9 am: a8c0d68b9c 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15612141

Change-Id: I1f645c287485d0af31e706215e010fe9a6f39d71
 2021-08-27 10:14:32 +00:00
Steven Moreland
65483bf84f Merge "Remove ndk_platform backend. Use the ndk backend." am: b992e7713c am: 8c9839f21e am: 43715cd264 am: ba606c6725 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1787976

Change-Id: I223f830f399de39ed444092be78f09850c910a3e
 2021-08-27 10:14:10 +00:00
Tyler Gunn
4920ae3355 Merge "Fix issue when adding existing connections via remote connection services." into sc-dev am: 5f54351908 am: 0bacd2b473 am: 93cffd669d 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15113691

Change-Id: I0b0ce37ae7407b6332f7a992c4bf1268c20dbdd6
 2021-08-27 10:13:28 +00:00
Tyler Gunn
a134b85ae7 Merge "Fix issue when adding existing connections via remote connection services." into sc-dev am: 5f54351908 am: e0eaef7772 am: 135c73537b 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15113691

Change-Id: I3fdc5962cba0066f5e58a656d4f130af1dc072b2
 2021-08-27 10:12:14 +00:00
Selim Cinek
d588964ef0 [automerger skipped] Fixed failing scrim test am: ac3e13a89c am: 97f9823318 -s ours am: 0ba21a18e6 -s ours 
am skip reason: Merged-In Ib9216246b9eb05b664d4f88f8cf6d11cc58e32d6 with SHA-1 ac3e13a89c is already in history

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

Change-Id: Ifefe15861c9cfd69faed1785377027208d6b5cce
 2021-08-27 10:12:02 +00:00
Selim Cinek
7ff780979c [automerger skipped] Fixed failing scrim test am: ac3e13a89c am: 4850cb8d57 am: 4f0d1227d3 -s ours 
am skip reason: Merged-In Ib9216246b9eb05b664d4f88f8cf6d11cc58e32d6 with SHA-1 ac3e13a89c is already in history

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

Change-Id: I2fb787a9be285845c542870ebf68cadc33909a81
 2021-08-27 10:11:56 +00:00
Zoey Chen
6acd16a539 [automerger skipped] Merge changes I61c32c74,I505c9b04,I5c19e6a8,I24e86a75 into sc-qpr1-dev am: 78569f942a am: 2d13812cab -s ours 
am skip reason: Merged-In I61c32c7454771583e252c5d23f5d41728472c41b with SHA-1 fc0d0bc3f5 is already in history

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

Change-Id: Id2b58e88bb974dc7f70c78c8d5e9cbe7cb8ed000
 2021-08-27 10:11:49 +00:00
Weng Su
771736dd2f [automerger skipped] [Provider Model] Fix WiFi SSID disappear issue am: 4ae3bc4e48 am: 55999ce8ad -s ours 
am skip reason: Merged-In I505c9b044f8b139fb6c5d4df415c5ad56ce7b301 with SHA-1 22306c37b4 is already in history

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

Change-Id: I1e045132d47523f0000695e687f1821e5e1fab95
 2021-08-27 10:11:46 +00:00
Weng Su
b071c3cdc8 [automerger skipped] [Provider Model] Enforce DISALLOW_CONFIG_WIFI in Internet Panel am: 4b41a41dc5 am: 77f2c3f036 -s ours 
am skip reason: Merged-In I5c19e6a8e52d2c9207053ffb7539d931d1f04799 with SHA-1 7c0b74fd8c is already in history

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

Change-Id: I56fa17a6a72afc80c13c4426940958fb1b515735
 2021-08-27 10:11:43 +00:00
Weng Su
3536d30fca [automerger skipped] [Provider Model] Correct Wi-Fi toggle title color in Dark Theme am: 6111f53747 am: 2edbba49cd -s ours 
am skip reason: Merged-In I24e86a75d4a72c837191277ed5258b81cd5aee00 with SHA-1 c9d58c10d6 is already in history

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

Change-Id: I79386b51e6add2545df4c31c22a02d9d333263a7
 2021-08-27 10:11:40 +00:00
Zoey Chen
ae564a750f [automerger skipped] Merge changes I566dfa75,Id0d372cf,Ifb79e402,Ic80ed7f8,I40ff3ed0 into sc-qpr1-dev am: e454d516ec am: a49709f09c -s ours 
am skip reason: Merged-In I566dfa7585ade8fcba53a6a98213776e156267bd with SHA-1 fb37824e06 is already in history

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

Change-Id: I38e610a9447596dfe1357d7ac279fe614b519cbe
 2021-08-27 10:11:23 +00:00
Zoey Chen
15d7c44e6d [automerger skipped] [Provider Model] 1.Only admin can config mobile data 2.Do not connect to mobile data when device is locked am: 0cf7dc970f am: 7bee6872ad -s ours 
am skip reason: Merged-In Id0d372cfe4e71f323ae3f3136acfb9857ad1c539 with SHA-1 0cf7dc970f is already in history

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

Change-Id: I5cde914e3020b6707c7d0667d1578ba8fc0e411b
 2021-08-27 10:11:20 +00:00
Zoey Chen
6d0be3da7b [automerger skipped] [Provider Model] Fix the toggle's size and dialog's width am: b17c58a732 am: 7c512bee53 -s ours 
am skip reason: Merged-In Ifb79e402540b4aef58f829312e836b4f11114a5d with SHA-1 b17c58a732 is already in history

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

Change-Id: I2fa4a447e17e8487a995ddbcb34199e4a108370a
 2021-08-27 10:11:17 +00:00
Weng Su
ad5c68c7f0 [automerger skipped] [Provider Model] Correct the connected Wi-Fi UI am: 151d93fdbc am: ba589f20fa -s ours 
am skip reason: Merged-In Ic80ed7f819ffb9f5821df244a3a4f7b2e5ac0379 with SHA-1 151d93fdbc is already in history

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

Change-Id: Ib2740cbb56cd219b19baf1d5092199a14b399cb4
 2021-08-27 10:11:14 +00:00
Weng Su
172cdaff2f [automerger skipped] [Provider Model] Should not show Wi-Fi entries under lockscreen am: b398d107ad am: c38cc5e8be -s ours 
am skip reason: Merged-In I40ff3ed0b38d590c0171c654ceaa433ceb0fac59 with SHA-1 b398d107ad is already in history

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

Change-Id: I66be620aa9d25ad6c6543632b24dec90683a95ae
 2021-08-27 10:11:11 +00:00
Zoey Chen
9ce85558f4 [automerger skipped] Merge changes I912e8d21,I7239d56b,Ic67d0078,I8394f580 into sc-qpr1-dev am: a1c0da71d7 am: 82a988146c -s ours 
am skip reason: Merged-In I912e8d21d19be0a82d7f3b3f8398808f335b42de with SHA-1 007eb0da4b is already in history

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

Change-Id: Ia8c18ebc91917a122163790ef112255525f61a53
 2021-08-27 10:10:53 +00:00
Weng Su
f684a54841 [automerger skipped] [Provider Model] Show Wi-Fi icon with exclamation mark am: 29aedbe529 am: fe30967814 -s ours 
am skip reason: Merged-In I7239d56b1ad394950f61f51779f0dac611aeddea with SHA-1 29aedbe529 is already in history

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

Change-Id: I1d30966da49f1e66876c411ac1882533b0b3c851
 2021-08-27 10:10:49 +00:00
Zoey Chen
5bcf3b9626 [automerger skipped] [Provider Model] Apply the latest figma of Provider Model am: d4712ff999 am: 9f1e79fb4a -s ours 
am skip reason: Merged-In Ic67d00787da7d4a6d971578ee8c7c3daa43fbfc3 with SHA-1 d4712ff999 is already in history

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

Change-Id: Ifa7d379d4c8ebdc9b1f588e7aca1fac73e1dfc0f
 2021-08-27 10:10:46 +00:00
Weng Su
4ca9a3143a [automerger skipped] [Provider Model] Show searching sub-title for 2 seconds am: 659b2885d3 am: 373a043d09 -s ours 
am skip reason: Merged-In I8394f5808d776589cbf115e6df8a7d456df5bc17 with SHA-1 659b2885d3 is already in history

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

Change-Id: I50f88c6b6bd78b666a384335da42d14207df69c5
 2021-08-27 10:10:43 +00:00
Treehugger Robot
8b90c4cae6 Merge "Correct comments" am: 2c0b1b672e am: d6b4b6dc69 am: 7c4190ef37 am: e11d931b2a 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1784149

Change-Id: If3a802952d643ab7180aaadfc2015029e2b9c904
 2021-08-27 10:10:28 +00:00
Zoey Chen
1e07f06cd4 [automerger skipped] Merge changes from topics "launch_wifi_details-sc-qpr1-dev", "refactor_icon_injector-sc-qpr1-dev" into sc-qpr1-dev am: c6691520b1 am: ed410c03ac -s ours 
am skip reason: Merged-In Ieb7080ab6f6462abc3820b47c2a58cc2ea2a083e with SHA-1 fc39764944 is already in history

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

Change-Id: I0491b8caf07146eec35e249431d7239aca0e029e
 2021-08-27 10:10:10 +00:00
Zoey Chen
03f442c2f7 [automerger skipped] [Provider Model] Cherry-pick from ag/15243691, ag/15287619, ag/15287620 and ag/15270751 am: 903f54b107 am: 0313f9c68c -s ours 
am skip reason: Merged-In I4ea7aa443659cef091f525e0064a7db4c95522e2 with SHA-1 c3abe4998d is already in history

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

Change-Id: I670ca8c041554ebcfa4a037fc89a95b550a71366
 2021-08-27 10:10:07 +00:00
Jooyung Han
f4c2717d34 Merge "telephony: suppress warnings in AIDL" am: 89242df0c9 am: 05820c8ff6 am: f2e4340476 am: 8f1cfa2ae8 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1796511

Change-Id: I1fa7836cee511781523bcb6dbbb24bf89ae69b93
 2021-08-27 10:09:52 +00:00
Zoey Chen
2e81277297 [automerger skipped] Merge "[Provider Model] Remove the flag of ProviderModel in InternetTile" into sc-qpr1-dev am: 50bdf2b540 am: e2749c27a2 -s ours 
am skip reason: Merged-In I1775c8169f6a42fb0944892850999744f87c3f24 with SHA-1 9fc7547580 is already in history

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

Change-Id: Ia7c0a5b91968fee3bd460ef73186a20828da05c1
 2021-08-27 10:09:26 +00:00
Arthur Hung
5e63fd8cd9 [automerger skipped] Merge "Add TYPE_STATUS_BAR_ADDITIONAL to trusted overlay" into sc-qpr1-dev am: 519749f60c am: 0869676255 -s ours 
am skip reason: Merged-In I3f41f3eeeed431309d348cc4d1286e4b346f1259 with SHA-1 da3f6a15d7 is already in history

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

Change-Id: If7d631af15e0ca0e70155091c85e6ff9174c9dd1
 2021-08-27 10:09:10 +00:00