Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
673,240 Commits 3 Branches 0 Tags
45ec6c69b4b9244dae4068acaa02b6648d65bcf6
Commit Graph

673240 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
TreeHugger Robot
45ec6c69b4 Merge "Keyguard indication area - owner info fix" into sc-qpr1-dev am: 97e242b331 am: a0677a8011 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15924909

Change-Id: I8bd544f28b5b14a411642f35e003d1bf6c75400b
 2021-09-28 16:24:31 +00:00
TreeHugger Robot
5073863f02 Merge "Keyguard indication area - owner info fix" into sc-qpr1-dev am: 97e242b331 am: 68da7eade2 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15924909

Change-Id: I37f919379396dca5dc1e99899838e9f10e1cdf7f
 2021-09-28 16:16:06 +00:00
TreeHugger Robot
a0677a8011 Merge "Keyguard indication area - owner info fix" into sc-qpr1-dev am: 97e242b331 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15924909

Change-Id: I8bad578d9be53a2304c623f930fd209a893e2245
 2021-09-28 16:07:41 +00:00
TreeHugger Robot
68da7eade2 Merge "Keyguard indication area - owner info fix" into sc-qpr1-dev am: 97e242b331 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15924909

Change-Id: Iff4cf49bd791e9db5cc72f399e5e92272b217e8e
 2021-09-28 16:07:39 +00:00
TreeHugger Robot
97e242b331 Merge "Keyguard indication area - owner info fix" into sc-qpr1-dev 2021-09-28 15:52:35 +00:00
TreeHugger Robot
f4f7ffcf3c [automerger skipped] Merge "DO NOT MERGE - Empty merge to indicate SP1A.210812.001 is already merged" into stage-aosp-master am: 310bf06da5 am: 7414295369 am: a2cbc7a4e0 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ic0e24c58d8ea0c18f16620dafac0a933ec8de64d
 2021-09-28 15:23:11 +00:00
Xin Li
e8000b18a0 [automerger skipped] DO NOT MERGE - Empty merge to indicate SP1A.210812.001 is already merged am: 73dba779b2 am: 0d5ffa548a am: e7f27bb145 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ide7ab73428383461053f65e59c22e049b012321f
 2021-09-28 15:22:44 +00:00
TreeHugger Robot
a2cbc7a4e0 Merge "DO NOT MERGE - Empty merge to indicate SP1A.210812.001 is already merged" into stage-aosp-master am: 310bf06da5 am: 7414295369 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15930695

Change-Id: I8110bda1bf064abbcd026081380fa65bb528ece7
 2021-09-28 15:02:01 +00:00
Xin Li
e7f27bb145 DO NOT MERGE - Empty merge to indicate SP1A.210812.001 is already merged am: 73dba779b2 am: 0d5ffa548a 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15930695

Change-Id: I481963a4a1c5fd23fa092abaef206c5f67c2488f
 2021-09-28 15:01:38 +00:00
TreeHugger Robot
0931e446e5 Merge "Fix stuck HDMI-CEC actions after boot" into stage-aosp-master am: 5d7bfac82a am: 80df3099d1 am: 75b045da0d 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15930804

Change-Id: I413e2e7640424e5c12b078d1d946ce339e809acd
 2021-09-28 14:44:09 +00:00
TreeHugger Robot
7414295369 Merge "DO NOT MERGE - Empty merge to indicate SP1A.210812.001 is already merged" into stage-aosp-master am: 310bf06da5 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15930695

Change-Id: Icda2875610fea73a69cea7056ad889b253df655f
 2021-09-28 14:43:35 +00:00
Xin Li
0d5ffa548a DO NOT MERGE - Empty merge to indicate SP1A.210812.001 is already merged am: 73dba779b2 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15930695

Change-Id: I937fcca2c512b83c4439754b8507b3219b653807
 2021-09-28 14:43:10 +00:00
TreeHugger Robot
75b045da0d Merge "Fix stuck HDMI-CEC actions after boot" into stage-aosp-master am: 5d7bfac82a am: 80df3099d1 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15930804

Change-Id: I167e33c5661d219e44afdb086e09621b77967ef3
 2021-09-28 14:24:28 +00:00
TreeHugger Robot
50513b9315 Merge "[DO NOT MERGE] Smartspace - Don't create session ahead of init" into sc-v2-dev am: 72bf1a1f38 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15923735

Change-Id: I687b9c3626bb9315a016012a98f84897dcb816f6
 2021-09-28 14:19:17 +00:00
Matt Pietal
d9dd674e6a [DO NOT MERGE] Smartspace - Don't create session ahead of init am: 1c12757203 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15923735

Change-Id: Iee48bfc717df5fdfedf0b0f9327bb1ad274da95e
 2021-09-28 14:19:11 +00:00
TreeHugger Robot
310bf06da5 Merge "DO NOT MERGE - Empty merge to indicate SP1A.210812.001 is already merged" into stage-aosp-master 2021-09-28 14:13:04 +00:00
TreeHugger Robot
80df3099d1 Merge "Fix stuck HDMI-CEC actions after boot" into stage-aosp-master am: 5d7bfac82a 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15930804

Change-Id: Ie0ac6b3d5117466cec6a4cd3263658d8541a47a4
 2021-09-28 14:10:21 +00:00
TreeHugger Robot
72bf1a1f38 Merge "[DO NOT MERGE] Smartspace - Don't create session ahead of init" into sc-v2-dev 2021-09-28 14:08:25 +00:00
TreeHugger Robot
5d7bfac82a Merge "Fix stuck HDMI-CEC actions after boot" into stage-aosp-master 2021-09-28 14:00:03 +00:00
Tom Natan
acbf655d5b Merge "Automatically remove other owned overrides when package override flag changes" into sc-v2-dev am: 721ac954af 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15897598

Change-Id: I0a9b242a5daeca464f2d3e35e36466373a67ea72
 2021-09-28 13:40:50 +00:00
Tom Natan
721ac954af Merge "Automatically remove other owned overrides when package override flag changes" into sc-v2-dev 2021-09-28 13:25:16 +00:00
Alastair Breeze
0b67c129c2 Merge "Launch injected location settings on same task" into sc-v2-dev am: 366209d97f 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15897407

Change-Id: I51be440cbca8dada46ba783b96942dbaac49fdbe
 2021-09-28 12:59:20 +00:00
Dave Mankoff
7c2391172d Merge "Remove Dependency.get from NavigationBar." into sc-v2-dev am: 22fb5df008 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15909679

Change-Id: Ief123b421b9291b30846705737b84db36ae8fbea
 2021-09-28 12:58:55 +00:00
Alastair Breeze
366209d97f Merge "Launch injected location settings on same task" into sc-v2-dev 2021-09-28 12:51:42 +00:00
Matt Pietal
1c12757203 [DO NOT MERGE] Smartspace - Don't create session ahead of init 
After the device is setup, if the smartspace component is not
available/initialized, don't attempt to start a session.

Fixes: 199986217
Test: atest LockscreenSmartspaceControllerTest
Change-Id: I36d6f75b37cc5f5274b1cea3a35338f6da424a20
(cherry picked from commit 076aad912e)
 2021-09-28 12:50:47 +00:00
Dave Mankoff
22fb5df008 Merge "Remove Dependency.get from NavigationBar." into sc-v2-dev 2021-09-28 12:45:39 +00:00
Matt Pietal
373aff0c7c Keyguard indication area - owner info fix 
There was discrepancy between how null values and empty strings were
treated in KeyguardIndication and KeyguardIndicationController. This
could lead to a crash in systemui. Modify the
KeyguardIndicationController to match the logic in KeyguardIndication.

Bug: 201339576
Test: KeyguardIndicationControllerTest
Change-Id: I8b7b4d7b33b1ee809df17e64347c816f65a50727
 2021-09-28 08:37:28 -04:00
William Escande
db80b4ad0b Merge "Migrate Cellbroadcast modules to use modules-utils" into stage-aosp-master am: 921efdf1bd am: 2798f8477b am: c581c33573 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15896730

Change-Id: Id5dcc482d3cb7a190a7abbc57c639bca47a23443
 2021-09-28 12:28:02 +00:00
Yan Han
62eafa258a Fix stuck HDMI-CEC actions after boot 
Ensures that all queued actions on local devices are started after
boot. Previously, an unstarted SendKeyAction could stick around after
boot, blocking any future SendKeyAction from being created.

Bug: 193188675
Test: atest HdmiControlServiceTest#normalBoot_queuedActionsStartedAfterBoot

      manual test: spam volume up on boot with IR volume control enabled

Change-Id: I0050ca927bdba939b0b0030a6aa2f6235b11ff5c
Merged-In: I0050ca927bdba939b0b0030a6aa2f6235b11ff5c
(cherry picked from commit 22dc89a89f)
(cherry picked from commit 66b6a8cc17d3c2f4d7d3a09369f7538633c43259)
 2021-09-28 12:22:10 +00:00
William Escande
c581c33573 Merge "Migrate Cellbroadcast modules to use modules-utils" into stage-aosp-master am: 921efdf1bd am: 2798f8477b 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15896730

Change-Id: I17ca114fbf3a851b947cf79722b0e42bf0e4e6e3
 2021-09-28 12:19:10 +00:00
William Escande
2798f8477b Merge "Migrate Cellbroadcast modules to use modules-utils" into stage-aosp-master am: 921efdf1bd 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15896730

Change-Id: Iaba3112fc75b57392638e1f57414b3696cf8e3c3
 2021-09-28 12:09:54 +00:00
William Escande
921efdf1bd Merge "Migrate Cellbroadcast modules to use modules-utils" into stage-aosp-master 2021-09-28 12:00:08 +00:00
Anton Hansson
0ac02ae06e Merge "Add a tool for merging annotation.zip files" am: 0e4260d772 am: b370ca080a am: 7ccd3666d6 am: 0d084d8990 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1837313

Change-Id: I9ece898b168f897ba56a853444c333722477a70e
 2021-09-28 11:34:40 +00:00
TreeHugger Robot
41a24f463c Merge changes from topic "expose-pending-intent" into stage-aosp-master am: b4f626d13e am: 78f1a9bf51 am: 4230a055d3 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15879511

Change-Id: I1f9814117187d712c4e5df8140d6ff62f06ebdf3
 2021-09-28 11:34:24 +00:00
Makoto Onuki
499e0307a2 Expose PendingIntent.addCancelListener am: 30bd1bb72d am: 81767ac876 am: 7baac81d13 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15879510

Change-Id: I30b8bca4033f96ce54c68a60a819a2d1d9179f34
 2021-09-28 11:34:20 +00:00
Mohammad Samiul Islam
d7e9b64de5 Merge "Fix broken test on GSI branch" into stage-aosp-master am: 10284429b8 am: 4e1d55b395 am: 8266717dbc 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15920104

Change-Id: Id4e463b3e162b5f6be28dec96821b3989fb8527f
 2021-09-28 11:33:09 +00:00
Anton Hansson
0d084d8990 Merge "Add a tool for merging annotation.zip files" am: 0e4260d772 am: b370ca080a am: 7ccd3666d6 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1837313

Change-Id: I88d2d563a7819bd1e9b459f5b9ad70be7ae6b6b3
 2021-09-28 11:13:47 +00:00
TreeHugger Robot
4230a055d3 Merge changes from topic "expose-pending-intent" into stage-aosp-master am: b4f626d13e am: 78f1a9bf51 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15879511

Change-Id: I66a50ffbae15636a6a2221f1b27b2449b724a26b
 2021-09-28 11:13:33 +00:00
Makoto Onuki
7baac81d13 Expose PendingIntent.addCancelListener am: 30bd1bb72d am: 81767ac876 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15879510

Change-Id: I8430547bd0a27020be5bcf2c99777f2e95b7b3e5
 2021-09-28 11:13:31 +00:00
Mohammad Samiul Islam
8266717dbc Merge "Fix broken test on GSI branch" into stage-aosp-master am: 10284429b8 am: 4e1d55b395 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15920104

Change-Id: I097bd62ada067f03217081a9127a0658430cdcf2
 2021-09-28 11:13:05 +00:00
Anton Hansson
7ccd3666d6 Merge "Add a tool for merging annotation.zip files" am: 0e4260d772 am: b370ca080a 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1837313

Change-Id: I5de7e2c5ae0d8f17f991fd2967575dae1cbf8f39
 2021-09-28 11:03:46 +00:00
TreeHugger Robot
78f1a9bf51 Merge changes from topic "expose-pending-intent" into stage-aosp-master am: b4f626d13e 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15879511

Change-Id: I617f1e422eba270fa07bac7218a8858f4f41da2f
 2021-09-28 11:03:11 +00:00
Makoto Onuki
81767ac876 Expose PendingIntent.addCancelListener am: 30bd1bb72d 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15879510

Change-Id: I80d0e7ee71ee126fb6da726bdce6fc8eec839576
 2021-09-28 11:03:08 +00:00
Mohammad Samiul Islam
4e1d55b395 Merge "Fix broken test on GSI branch" into stage-aosp-master am: 10284429b8 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15920104

Change-Id: I9fb1e540b95ed4fc194721113895027092dc5cf6
 2021-09-28 10:59:49 +00:00
Anton Hansson
b370ca080a Merge "Add a tool for merging annotation.zip files" am: 0e4260d772 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1837313

Change-Id: I3f2685923a00e0ef8bf9c6261eae93b5ede287b0
 2021-09-28 10:46:16 +00:00
TreeHugger Robot
b4f626d13e Merge changes from topic "expose-pending-intent" into stage-aosp-master 
* changes:
  Reduce PendingIntent memory allocation
  Expose PendingIntent.addCancelListener
 2021-09-28 10:39:52 +00:00
Mohammad Samiul Islam
10284429b8 Merge "Fix broken test on GSI branch" into stage-aosp-master 2021-09-28 10:36:09 +00:00
Anton Hansson
0e4260d772 Merge "Add a tool for merging annotation.zip files" 2021-09-28 10:27:22 +00:00
Nick Chameyev
25c47089f3 Merge "Rename shouldUseDefaultUnfoldTransition attribute and update docs" into sc-v2-dev am: b85da640d1 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15897413

Change-Id: I5ba40e2af5840824ede3b1aa246b0fc7825368ad
 2021-09-28 10:22:18 +00:00
Alastair Breeze
f1ba6081eb Launch injected location settings on same task 
Removes activity launch flags that cause the injected location settings
to launch in a new task. This improves animations and settings support
for different form factors.

Fixes: 197608838
Fixes: 197608555
Test: manual
Change-Id: If2deb44058f7d7786a27310d4430f2e83879baa9
 2021-09-28 10:19:58 +00:00