Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
657,404 Commits 3 Branches 0 Tags
75b045da0d9390069946f0ea008ef33b044c3dce
Commit Graph

657404 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
5d7bfac82a Merge "Fix stuck HDMI-CEC actions after boot" into stage-aosp-master 2021-09-28 14:00:03 +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
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
Pablo Gamito
8e3542e93c Merge changes Ibd9f22af,Id42f5276 into sc-qpr1-dev am: e1841dc539 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15897408

Change-Id: If84f119f096eea4e5455ed985acf5a310a5de5c1
 2021-09-28 05:13:41 +00:00
Pablo Gamito
01dd8acb6e Stop relying on background color attribute to set task transition background am: a5f3e90212 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15897416

Change-Id: I9b08a881e1227d08a57af14298d16336f5325058
 2021-09-28 05:13:30 +00:00
Pablo Gamito
e1841dc539 Merge changes Ibd9f22af,Id42f5276 into sc-qpr1-dev 
* changes:
  Revert "Add API to specify background color for animations"
  Stop relying on background color attribute to set task transition background
 2021-09-28 04:57:52 +00:00
Treehugger Robot
31e6117eb0 Merge "Update permissions OWNERS" am: dbbb827a79 am: 799b63acc2 am: 3c213db1f8 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1838051

Change-Id: I97291bc29cfc2a473f7c01e5fd312ba5e9ee7b3f
 2021-09-28 04:49:22 +00:00
Treehugger Robot
3c213db1f8 Merge "Update permissions OWNERS" am: dbbb827a79 am: 799b63acc2 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1838051

Change-Id: Icca94c1cfe365e69e3fdbfd2ca414e9d521be74d
 2021-09-28 04:34:38 +00:00
Treehugger Robot
799b63acc2 Merge "Update permissions OWNERS" am: dbbb827a79 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1838051

Change-Id: Ic4d3da57e701c0da40c55bd44d73df0edce9a911
 2021-09-28 04:19:01 +00:00
Treehugger Robot
dbbb827a79 Merge "Update permissions OWNERS" 2021-09-28 04:04:52 +00:00
TreeHugger Robot
fdabd53c98 Merge "[Ongoing Call] Remove the call chip when #onEntryCleanUp is called." into sc-qpr1-dev am: 16517d739d 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15923991

Change-Id: I55b07b345c0778a870830d448fe86586d9e5df89
 2021-09-28 02:19:47 +00:00
TreeHugger Robot
16517d739d Merge "[Ongoing Call] Remove the call chip when #onEntryCleanUp is called." into sc-qpr1-dev 2021-09-28 02:08:27 +00:00
Evan Severson
73ebf86c32 Update permissions OWNERS 
Bug: 201319595
Test: None
Change-Id: Iebb9cd731b592df2dfb79bd088e917635c21b6b1
 2021-09-28 01:03:32 +00:00
Treehugger Robot
b7105599ad Merge "Set verbosity for api_versions_trimmer_unittests" am: 3b63045444 am: 86ac824eb9 am: ace5d30a1d 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1837394

Change-Id: I72526c5c544efab507d856f7e7a8b01c66532102
 2021-09-28 00:38:34 +00:00
Treehugger Robot
ace5d30a1d Merge "Set verbosity for api_versions_trimmer_unittests" am: 3b63045444 am: 86ac824eb9 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1837394

Change-Id: I34d3db295d8268176cf01e8faeb81b6f5aac2ae3
 2021-09-28 00:25:06 +00:00
Treehugger Robot
86ac824eb9 Merge "Set verbosity for api_versions_trimmer_unittests" am: 3b63045444 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1837394

Change-Id: I5d572a1b11cf7025251b30c6257f0fe854185aea
 2021-09-28 00:13:14 +00:00
Treehugger Robot
95d202d364 [automerger skipped] Merge "Backport multi user trace changes." am: 3bf3a055c7 -s ours am: 7034d646d5 -s ours am: 9eb4a5431d -s ours 
am skip reason: Merged-In I1661558dced6cb326ce11c94672b60f0352eab3c with SHA-1 7d84ba8cbc is already in history

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

Change-Id: I03e3173c289bc2bae5fdb343fcb07ac048e45f6e
 2021-09-28 00:12:51 +00:00
Treehugger Robot
3b63045444 Merge "Set verbosity for api_versions_trimmer_unittests" 2021-09-27 23:56:35 +00:00
Treehugger Robot
9eb4a5431d [automerger skipped] Merge "Backport multi user trace changes." am: 3bf3a055c7 -s ours am: 7034d646d5 -s ours 
am skip reason: Merged-In I1661558dced6cb326ce11c94672b60f0352eab3c with SHA-1 7d84ba8cbc is already in history

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

Change-Id: Ibc1644ac4c57a17cc18623613b9568ef3636ebe3
 2021-09-27 23:51:24 +00:00
Treehugger Robot
7034d646d5 [automerger skipped] Merge "Backport multi user trace changes." am: 3bf3a055c7 -s ours 
am skip reason: Merged-In I1661558dced6cb326ce11c94672b60f0352eab3c with SHA-1 7d84ba8cbc is already in history

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

Change-Id: I95a5c891b6cf6d14f96d803dfd8db6ebe851879c
 2021-09-27 23:34:49 +00:00
Treehugger Robot
3bf3a055c7 Merge "Backport multi user trace changes." 2021-09-27 23:22:14 +00:00
Pablo Gamito
66d4318c18 Revert "Add API to specify background color for animations" 
This reverts commit 2ccc829e71.

Reason for revert: No longer needed

Test: Existing tests
Bug: 200763116
Change-Id: Ibd9f22af05eba99c4509b503665c1e915993c940
 2021-09-27 23:42:32 +02:00
Pablo Gamito
a5f3e90212 Stop relying on background color attribute to set task transition background 
Because the background attribute used to have a different use some apps still set it and it means we could run transitions with unexpected background colors

Test: Existing

Fixes: 200763116
Merged-In: Id42f52760cb9a681c6c33f3c261d7db5e2f71af3
Change-Id: Id42f52760cb9a681c6c33f3c261d7db5e2f71af3
 2021-09-27 23:42:15 +02:00
Gopinath Elanchezhian
33f29f1591 Backport multi user trace changes. 
Bug: b/190233841

Test: Builds successfully
Change-Id: I9fb702d51eeac4749097ea34d44bf78c202a288a
Merged-In: I1661558dced6cb326ce11c94672b60f0352eab3c
 2021-09-27 20:36:10 +00:00
TreeHugger Robot
37de40f977 Merge "Audio focus: make media fade out temporary" into sc-qpr1-dev am: cee2cddebe 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15916332

Change-Id: Ifc5fff4223376f5e58d280362eec7fb9274ba1c3
 2021-09-27 20:33:44 +00:00
TreeHugger Robot
cee2cddebe Merge "Audio focus: make media fade out temporary" into sc-qpr1-dev 2021-09-27 20:07:52 +00:00
Caitlin Cassidy
83f1718952 [Ongoing Call] Remove the call chip when #onEntryCleanUp is called. 
See bug comment #9 for an in-depth explanation.

Test: New unit tests.
Test: I created a test app that sends an ongoing call notification
then removes it 200ms later, and I confirmed that the bug is triggered
without this CL, and is fixed with this CL.
Bug: 199600334

Change-Id: I0f681ccfe55597490bee0d4b190f9fb2c38e28f2
(cherry picked from commit cd755525c4)
Merged-In: I0f681ccfe55597490bee0d4b190f9fb2c38e28f2
 2021-09-27 19:40:13 +00:00
TreeHugger Robot
eec4c992cd Merge "[DO NOT MERGE] Smartspace - Don't create session ahead of init" into sc-qpr1-dev am: 3a8df63e40 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15921184

Change-Id: I09a79291530305dd9f3dde52638de38ee23ccd04
 2021-09-27 18:33:41 +00:00
Matt Pietal
400d4b16a6 [DO NOT MERGE] Smartspace - Don't create session ahead of init am: 076aad912e 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15921184

Change-Id: I1783a19f1549b50c2ff054ae69ff7cc5991b5eee
 2021-09-27 18:33:31 +00:00
TreeHugger Robot
3a8df63e40 Merge "[DO NOT MERGE] Smartspace - Don't create session ahead of init" into sc-qpr1-dev 2021-09-27 18:20:41 +00:00
Josh Tsuji
6cd2f558ea Merge "Add windowIsFloating to the volume dialog to fix insets issues." into sc-qpr1-dev am: f234de508d 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15909680

Change-Id: I142923c7288cbd6add0f1dc8533d8f2f9bf60e58
 2021-09-27 17:36:32 +00:00
Josh Tsuji
f234de508d Merge "Add windowIsFloating to the volume dialog to fix insets issues." into sc-qpr1-dev 2021-09-27 17:21:08 +00:00
Anton Hansson
e673784439 Add a tool for merging annotation.zip files 
We now produce annotation.zip files individually for each module, but
for the public SDK it's easier to distribute a single zip file with
merged contents. Add a tool for merging these (simple) files.

Bug: 187397779
Test: unittest in cl
Test: diff tests in follow-on CL merging all module annotations.zip
Change-Id: Ic5bb94425dccafab43340805f73fafacab53cb28
 2021-09-27 17:46:26 +01:00
Matt Pietal
076aad912e [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
 2021-09-27 16:01:24 +00:00