Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
726,405 Commits 3 Branches 0 Tags
f483aae674e549320389fa648d56d91ddbab9dff
Commit Graph

726405 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Michal Olech
f483aae674 Merge changes Ifb05b969,I74808d8e 
* changes:
  [CEC Configuration] Switch HDMI_CONTROL_AUTO_DEVICE_OFF_ENABLED to Shared Preferences
  [CEC Configuration] Switch HDMI_CEC_ENABLED to Shared Preferences
 2021-10-18 10:38:44 +00:00
Wei Sheng Shih
93d235902d Merge "Revert "Use display awake signal to replace screen-off signal for sleep token."" into sc-v2-dev am: 2328dee098 am: cda95b514a 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16074573

Change-Id: I397de8535578482e79ba3ee2d3a597d7c1bf0444
 2021-10-18 09:58:26 +00:00
Michał Brzeziński
64258bbb6f Merge "Fixing Heads Up Notifications not reacting to action touches in split shade" into sc-v2-dev am: 4772ecd698 am: ca1bb8b3da 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16031101

Change-Id: I24ad1bf51956372731bc0c2e672f67fbd3e213a9
 2021-10-18 09:57:40 +00:00
Miguel Aranda
287245f148 [automerger skipped] Merge "Revert "Provide IconProvider in sysui dagger"" into sc-v2-dev am: b169404b77 am: d35724797b -s ours 
am skip reason: Merged-In If4ab0590f4b850103411b6a2dccf2092bb06d563 with SHA-1 d5abf60750 is already in history. Merged-In was found from reverted change.

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

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

Change-Id: I0bf6f4ba86f5efcfd43607bdcaaa0ccdae321f54
 2021-10-18 09:56:09 +00:00
Wei Sheng Shih
cda95b514a Merge "Revert "Use display awake signal to replace screen-off signal for sleep token."" into sc-v2-dev am: 2328dee098 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16074573

Change-Id: Ic20884a16f3035a566d35d17361b1bb54d4e642a
 2021-10-18 09:46:35 +00:00
Michał Brzeziński
ca1bb8b3da Merge "Fixing Heads Up Notifications not reacting to action touches in split shade" into sc-v2-dev am: 4772ecd698 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16031101

Change-Id: I42ab7a4ccbe291511f2a70a35c12aff7a20d4e92
 2021-10-18 09:45:39 +00:00
Miguel Aranda
d35724797b Merge "Revert "Provide IconProvider in sysui dagger"" into sc-v2-dev am: b169404b77 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16074574

Change-Id: Ib8fc344996264f9d1dbeb79917fa3c06de35ed7f
 2021-10-18 09:44:21 +00:00
Wei Sheng Shih
2328dee098 Merge "Revert "Use display awake signal to replace screen-off signal for sleep token."" into sc-v2-dev 2021-10-18 09:33:12 +00:00
Michał Brzeziński
4772ecd698 Merge "Fixing Heads Up Notifications not reacting to action touches in split shade" into sc-v2-dev 2021-10-18 09:26:19 +00:00
Corina Grigoras
d1b61d2aca Merge "Revert "WallpaperManagerService - avoid leaking whether a package is installed"" 2021-10-18 09:18:34 +00:00
Miguel Aranda
b169404b77 Merge "Revert "Provide IconProvider in sysui dagger"" into sc-v2-dev 2021-10-18 09:17:45 +00:00
JW Wang
9c6e07a76f Merge changes from topic "bug195517333" 
* changes:
  Support rollback for rebootless apex (2/n)
  Handle downgrade install for rebootless apexes correctly (1/n)
 2021-10-18 09:09:21 +00:00
Jerry Chang
289347aedf Revert "Provide IconProvider in sysui dagger" 
This reverts commit f59eccd4a6.

Reason for revert: b/203356785, missed to update CarLauncher correspondingly in sc-v2

Change-Id: I0902b496b69e415fa0208948307fdf3883a1be17
 2021-10-18 08:55:36 +00:00
TreeHugger Robot
e0af999e84 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: 53e6f9e01a -s ours am: 5ae87e3a49 -s ours am: 79897f0cb1 -s ours am: 36ad4987d0 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I7a0051fd36c5634617cd85783f959e728b986dfc
 2021-10-18 08:39:17 +00:00
TreeHugger Robot
523fc9768d [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: 3986695d05 -s ours am: e53b569e36 -s ours am: d4a917b428 -s ours am: 44b32b153b -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ieda143510ed04bd2f2c6aff8d0035423e3772726
 2021-10-18 08:39:01 +00:00
TreeHugger Robot
1d441fb8fc [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: c499631f1f -s ours am: 0773dbc8d7 -s ours am: 413382368c -s ours am: fe74a527b3 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I205892662d1c11995e3b69383ea030323b4e9458
 2021-10-18 08:38:45 +00:00
TreeHugger Robot
6b72c4a072 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: 53e6f9e01a -s ours am: 7de25b844e -s ours am: e6abf31f19 -s ours am: 428da7d5e0 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ic592d684bf5c04639aea77a620bdd31090d59df5
 2021-10-18 08:38:27 +00:00
Wei Sheng Shih
14c00788a9 Revert "Use display awake signal to replace screen-off signal for sleep token." 
This reverts commit 0760ca28ea.

Reason for revert: b/203378136

Change-Id: I3e092625b49f8fa6b56cad898657cbc5844fe026
 2021-10-18 08:38:15 +00:00
TreeHugger Robot
9ebd35463e [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: 3986695d05 -s ours am: eac5554e0e -s ours am: 749e698b1d -s ours am: fdc6a24064 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I1bd39a411895ae4d3819414916ad142940d34ec1
 2021-10-18 08:38:08 +00:00
TreeHugger Robot
36ad4987d0 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: 53e6f9e01a -s ours am: 5ae87e3a49 -s ours am: 79897f0cb1 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I9579e3bcf22c09e6a125b5023cf68b2fb7426ce4
 2021-10-18 08:38:06 +00:00
TreeHugger Robot
44b32b153b [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: 3986695d05 -s ours am: e53b569e36 -s ours am: d4a917b428 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I95a08a0c264e61f662cb5542677f3a101d04e6d5
 2021-10-18 08:38:02 +00:00
TreeHugger Robot
fe74a527b3 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: c499631f1f -s ours am: 0773dbc8d7 -s ours am: 413382368c -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I22726efea4b0c231fcddcf5047366dd9b7dd62d4
 2021-10-18 08:37:55 +00:00
TreeHugger Robot
428da7d5e0 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: 53e6f9e01a -s ours am: 7de25b844e -s ours am: e6abf31f19 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I190c1cd9614da579b776d6a30e8cc0f36b88e8a4
 2021-10-18 08:37:46 +00:00
TreeHugger Robot
1361943bf0 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: c499631f1f -s ours am: 91104ba033 -s ours am: 3684e58ea6 -s ours am: 7b25f072d9 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Id556ddccfb0585e8d2e3e2b5293783982d931d99
 2021-10-18 08:37:45 +00:00
TreeHugger Robot
fdc6a24064 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: 3986695d05 -s ours am: eac5554e0e -s ours am: 749e698b1d -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ie2b80806ca7ddb6b705825761f3b79f66b304fea
 2021-10-18 08:37:32 +00:00
TreeHugger Robot
73e1a706fd [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-qpr1-dev am: 6e2bdea60b -s ours am: b68cd6f855 -s ours am: 542e2a866c -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I6929659d46b08fa8c125cd6f6d7e30816b53600a
 2021-10-18 08:37:26 +00:00
TreeHugger Robot
7b25f072d9 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: c499631f1f -s ours am: 91104ba033 -s ours am: 3684e58ea6 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I3853512fd3fa0099a0e80b08a1a7a9fc90b6e6f5
 2021-10-18 08:37:22 +00:00
TreeHugger Robot
542e2a866c [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-qpr1-dev am: 6e2bdea60b -s ours am: b68cd6f855 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Iefaab476b871e9ad79c967b1a8e656b480ede9bb
 2021-10-18 08:37:05 +00:00
TreeHugger Robot
6a075bfad0 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-qpr1-dev am: 3996156430 -s ours am: 4d2484b951 -s ours am: 3830dfeaa2 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I8d5783803201c6e7a8df060562267eb418db40f9
 2021-10-18 08:37:00 +00:00
TreeHugger Robot
3830dfeaa2 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-qpr1-dev am: 3996156430 -s ours am: 4d2484b951 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Idc759b04d9e63caede30d8eb7559020c8fa3362e
 2021-10-18 08:36:43 +00:00
TreeHugger Robot
d038abe367 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-qpr1-dev am: b93235188a -s ours am: 09b1538b18 -s ours am: 74bb35a552 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I9ebd2f40dfac855d174dc894334216c8aea6b349
 2021-10-18 08:36:40 +00:00
TreeHugger Robot
74bb35a552 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-qpr1-dev am: b93235188a -s ours am: 09b1538b18 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I10628df16dd0c31752dbbbd4786fa6bc538f1db9
 2021-10-18 08:36:20 +00:00
TreeHugger Robot
acc730b328 Merge "Remove IApplicationToken" 2021-10-18 08:35:50 +00:00
TreeHugger Robot
7d03223e27 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: 53e6f9e01a -s ours am: 7de25b844e -s ours am: e171d058f4 -s ours am: 041ebce593 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Iba3c3f5048f24e5cfb3466fd8493a1dffb6d4a19
 2021-10-18 08:35:07 +00:00
TreeHugger Robot
b38056192d [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: 3986695d05 -s ours am: eac5554e0e -s ours am: 5fef317409 -s ours am: b818f2db1a -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I7a1e0a650a6ee31fdb85cf02bbef737dd6d64064
 2021-10-18 08:34:49 +00:00
TreeHugger Robot
8426acbf3c [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: c499631f1f -s ours am: 91104ba033 -s ours am: 64ee689cd5 -s ours am: b23c20ff26 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Icb3422169c36bf49c711ea93e874ec6b6b13232c
 2021-10-18 08:34:31 +00:00
TreeHugger Robot
413ede9ef6 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-qpr1-dev am: 6e2bdea60b -s ours am: f862f9406c -s ours am: 29fda90919 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I69ebc0dfe92ae0895bac03e78efd46f60563ee23
 2021-10-18 08:34:14 +00:00
TreeHugger Robot
e8e55ca604 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-qpr1-dev am: 3996156430 -s ours am: 79111bde2c -s ours am: 401031e210 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ib56b156b5fc71adebe0b434eb55df1f514c04f70
 2021-10-18 08:33:49 +00:00
TreeHugger Robot
abd2131db6 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-qpr1-dev am: b93235188a -s ours am: 58ad4c57e8 -s ours am: 9be00f9b15 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Icb243e7ca10c65313f86eb546e92b8ef594cd1d3
 2021-10-18 08:33:25 +00:00
TreeHugger Robot
f670509a17 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev am: 9a06bb936f -s ours am: d546faaa1e -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I1f368663a9823c7f6eae86c1acccd0502c805812
 2021-10-18 08:33:08 +00:00
TreeHugger Robot
79897f0cb1 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: 53e6f9e01a -s ours am: 5ae87e3a49 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I93ade8745f022bb6794aed883c75e3b5d203e737
 2021-10-18 08:32:16 +00:00
TreeHugger Robot
3032364d47 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev am: a95065d9ff -s ours am: 69f03e3957 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ibfff94d692224cce92d56360c90e7b36d83c8ba7
 2021-10-18 08:32:16 +00:00
TreeHugger Robot
d4a917b428 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: 3986695d05 -s ours am: e53b569e36 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ib5eaa3cc65da6a28d354ecf322d2d8bc6022ad35
 2021-10-18 08:32:05 +00:00
TreeHugger Robot
041ebce593 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: 53e6f9e01a -s ours am: 7de25b844e -s ours am: e171d058f4 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ic0b019f2ffebb5f463e6d6f3a1c26432e3cdf6c9
 2021-10-18 08:31:44 +00:00
TreeHugger Robot
1f1e8e01b1 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: 53e6f9e01a -s ours am: 16167d9b69 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I84963158b51ed2c8852feb66bf9b66e1126f4809
 2021-10-18 08:31:15 +00:00
TreeHugger Robot
b818f2db1a [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: 3986695d05 -s ours am: eac5554e0e -s ours am: 5fef317409 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ica89d06342b76ae90b3b6fcc8a0ea82b6ce967a6
 2021-10-18 08:31:14 +00:00
Automerger Merge Worker
d66fff04e4 Merge "[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: 3986695d05 -s ours am: d871b6fc01 -s ours" 2021-10-18 08:31:11 +00:00
TreeHugger Robot
413382368c [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: c499631f1f -s ours am: 0773dbc8d7 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ib5244cd4e105902f83f3bbad5393dbe13a5f6fce
 2021-10-18 08:30:57 +00:00
TreeHugger Robot
8a9d0425b1 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev am: 534b9c9a27 -s ours am: e399e1d1cc -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I577b8b59d7bd887fbd4b638ed622e6bb003e2e3c
 2021-10-18 08:30:52 +00:00
TreeHugger Robot
193902649a [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: 3986695d05 -s ours am: d871b6fc01 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ie78b092555254d71c904c8b2ab1c9c5240714a2e
 2021-10-18 08:30:44 +00:00