Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
658,354 Commits 3 Branches 0 Tags
ac1e36b59f59084e2d360ce60ffdc6b258d84f4e
Commit Graph

658354 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Eric Laurent
6b85e8e831 Merge "AudioService: fix permission check on volume control" into sc-qpr1-dev am: 50d7e14c25 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15897410

Change-Id: I8508f8507e3b28c06584517ecaed0d791a681846
 2021-09-28 16:53:28 +00:00
Eric Laurent
50d7e14c25 Merge "AudioService: fix permission check on volume control" into sc-qpr1-dev 2021-09-28 16:38:34 +00:00
Mohammad Islam
0b3fa2a944 [automerger skipped] Merge "Fix broken test on GSI branch" am: 0fe46d947a -s ours am: 430ef242c4 -s ours am: efa70ccb43 -s ours 
am skip reason: Merged-In Ibdd72ec062538838ad60b847ee1ff31a792520a3 with SHA-1 ecafad4383 is already in history

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

Change-Id: I02f612c50a6455c48285734dbe0946bcc6b05c83
 2021-09-28 16:16:25 +00:00
William Escande
ce093d6738 Expose Phone.ENTERPRISE_CONTENT_URI as systemApi 
Also add INTERACT_ACROSS_USERS as a requires permission
Bug: 194119078
Tag: #refactor
Test: Build

Change-Id: Iccc093d9224ed34eb76e64561607dac6085cb876
 2021-09-28 18:11:33 +02: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
Mohammad Islam
efa70ccb43 [automerger skipped] Merge "Fix broken test on GSI branch" am: 0fe46d947a -s ours am: 430ef242c4 -s ours 
am skip reason: Merged-In Ibdd72ec062538838ad60b847ee1ff31a792520a3 with SHA-1 ecafad4383 is already in history

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

Change-Id: Id2b0a40c57d9d7db822a1868a19f74e52b772bc3
 2021-09-28 16:07:09 +00:00
Mohammad Islam
430ef242c4 [automerger skipped] Merge "Fix broken test on GSI branch" am: 0fe46d947a -s ours 
am skip reason: Merged-In Ibdd72ec062538838ad60b847ee1ff31a792520a3 with SHA-1 ecafad4383 is already in history

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

Change-Id: If953a25bd4c4a03cd336570a7dd7113db161542e
 2021-09-28 15:56:13 +00:00
TreeHugger Robot
97e242b331 Merge "Keyguard indication area - owner info fix" into sc-qpr1-dev 2021-09-28 15:52:35 +00:00
Mohammad Islam
0fe46d947a Merge "Fix broken test on GSI branch" 2021-09-28 15:37:08 +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
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
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
Yan Han
85b7711700 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.

Unit tests omitted because of AOSP incompatibilities.

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)
 2021-09-28 14:00:48 +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
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
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
Xin Li
73dba779b2 DO NOT MERGE - Empty merge to indicate SP1A.210812.001 is already merged 
Merged-In: I59d1aa9bf89cf29d59e72207d4e8e5900c4d5666
Change-Id: Idd10f8e55c4ec1d7e158e8627f10debccccb177c
 2021-09-28 07:55:17 +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
Nader Jawad
74eaabead9 Fix initialization of snapshot SkImage instance 
Fix issue where the initial snapshot used to create a
resultant SkImage instance with an SkImageFilter applied
was not initialized.

Fixes: 201312688
Test: Re-ran CTS tests
Change-Id: I2440a161c70076850479c562c7c9e6dc8d756236
 2021-09-28 02:30:40 +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