Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
542,466 Commits 3 Branches 0 Tags
56936beddd997d381a4e893c437d396caabbe02e
Commit Graph

542466 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Neil Fuller
a508d258c2 [automerger skipped] Merge "Fix a remove*Listener call that doesn't remove" into rvc-dev am: a95a24a0a0 am: 6e9f2d2a65 -s ours am: 863d8d6ad9 -s ours 
am skip reason: Change-Id I67b57e8df8a6d39622999634cefdc267fc07ecae with SHA-1 5fa4955154 is in history

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

Change-Id: Ic2cc61b080203088606067ff77c387cd4bdd56c8
 2020-06-12 16:41:12 +00:00
TreeHugger Robot
f5ddc7682e Merge "Don't throw exceptions in NotifCollection when initializing" into rvc-dev am: 8cf7a51d3d am: 1d21f39fef am: 9f671ae921 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11847539

Change-Id: Idbf2b5683fbcf165a4cc34ea7bd7b0a674895e04
 2020-06-12 16:40:47 +00:00
TreeHugger Robot
f7ff7dbbdd Merge "Don't throw exceptions in NotifCollection when initializing" into rvc-dev am: 8cf7a51d3d am: c112078a27 am: 0fd1de932a 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11847539

Change-Id: I7dd846c08971036100856f465db7bbdf1b04ce20
 2020-06-12 16:40:15 +00:00
Automerger Merge Worker
fed65ff77b Merge "Merge "Fix a remove*Listener call that doesn't remove" into rvc-dev am: a95a24a0a0 am: 6e9f2d2a65 am: 37628631c3" into rvc-qpr-dev-plus-aosp 2020-06-12 16:40:09 +00:00
Neil Fuller
431e606f99 Merge "Fix a remove*Listener call that doesn't remove" into rvc-dev am: a95a24a0a0 am: 6e9f2d2a65 am: 37628631c3 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11837611

Change-Id: I141b8e529fff5a5d5acb8c4c0b2282b7723c3bf8
 2020-06-12 16:40:02 +00:00
Jordan Jozwiak
7d48d460c0 Merge "DO NOT MERGE - Allow locking with feature or permission" into rvc-dev am: 7048655cbe am: 6f60371228 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11739858

Change-Id: I0fd8b8fa83c874edbee446fcf47d479b4345bd5c
 2020-06-12 16:39:52 +00:00
Neil Fuller
ea83471eb8 Merge "Fix a remove*Listener call that doesn't remove" into rvc-dev am: a95a24a0a0 am: 4054090215 am: ffda3766f6 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11837611

Change-Id: I83a60ef55a796ff250ce9b244063191fef90e70b
 2020-06-12 16:39:52 +00:00
Jordan Jozwiak
412d74f4ea DO NOT MERGE - Allow locking with feature or permission am: 9ead5a3c05 am: 1c71776f9b 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11739858

Change-Id: I2115977b5db532c6cce8b09c7eabcf566a72eba4
 2020-06-12 16:39:42 +00:00
Jordan Jozwiak
6f60371228 Merge "DO NOT MERGE - Allow locking with feature or permission" into rvc-dev am: 7048655cbe 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11739858

Change-Id: Id15bb58fa014cfc1eadedf97d0d13da13dc7ba22
 2020-06-12 16:32:53 +00:00
Jordan Jozwiak
5756ae944f Merge "DO NOT MERGE - Allow locking with feature or permission" into rvc-dev am: 7048655cbe 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11739858

Change-Id: Ifd628c4df89c2fdb2bbbf069ccda11a0677b1713
 2020-06-12 16:32:48 +00:00
Jordan Jozwiak
1c71776f9b DO NOT MERGE - Allow locking with feature or permission am: 9ead5a3c05 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11739858

Change-Id: If2799ec77afaf273db94e88bf101da0de28ec9a0
 2020-06-12 16:32:46 +00:00
Jordan Jozwiak
a50847e505 DO NOT MERGE - Allow locking with feature or permission am: 9ead5a3c05 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11739858

Change-Id: Ib5e4bb9400789f5666cd5b8d466afdd89f76e724
 2020-06-12 16:32:43 +00:00
TreeHugger Robot
d67e0ea6e4 Merge "Don't throw exceptions in NotifCollection when initializing" into rvc-dev am: 8cf7a51d3d am: c112078a27 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11847539

Change-Id: Icec3df855ea822c448b4b29e048ae37fd6547048
 2020-06-12 16:32:28 +00:00
Neil Fuller
863d8d6ad9 [automerger skipped] Merge "Fix a remove*Listener call that doesn't remove" into rvc-dev am: a95a24a0a0 am: 6e9f2d2a65 -s ours 
am skip reason: Change-Id I67b57e8df8a6d39622999634cefdc267fc07ecae with SHA-1 5fa4955154 is in history

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

Change-Id: I03c38bb6fe0a26650258e830ac0eda3996efa025
 2020-06-12 16:32:19 +00:00
TreeHugger Robot
0fd1de932a Merge "Don't throw exceptions in NotifCollection when initializing" into rvc-dev am: 8cf7a51d3d am: c112078a27 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11847539

Change-Id: I91e1eee6ef45a11930859fb3ec5fa9b85c6f3477
 2020-06-12 16:31:40 +00:00
Alex Buynytskyy
6e3c563f07 Internal version of isChangeEnabled. 
Do not check permissions when called from within system server. It's up
to PM to make sure it's doing the right thing.

Bug: 157191740
Test: adb reboot; adb logcat | grep "Finished scanning system apps"

Change-Id: Icde2a3d62f7eacfbeb33e102f74d1f2ca06a4439
 2020-06-12 09:31:34 -07:00
Beth Thibodeau
7fee1968cd Remove controls when apps are stopped or removed 
Listen for app uninstall, suspend, and force quit, and remove all
controls corresponding to that package

Fixes: 157288710
Fixes: 156793169
Test: manual
Change-Id: Ib9bb08e4a696a43f40bb3ebdd1ebd236727d0fc0
 2020-06-12 12:31:16 -04:00
TreeHugger Robot
9f671ae921 Merge "Don't throw exceptions in NotifCollection when initializing" into rvc-dev am: 8cf7a51d3d am: 1d21f39fef 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11847539

Change-Id: I2f3af608b90bb80317a505fbb6b9261ae52e0180
 2020-06-12 16:28:50 +00:00
Neil Fuller
ffda3766f6 Merge "Fix a remove*Listener call that doesn't remove" into rvc-dev am: a95a24a0a0 am: 4054090215 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11837611

Change-Id: Ic909cbafb10ca466148728060793c9a4a09d5de5
 2020-06-12 16:28:41 +00:00
Neil Fuller
37628631c3 Merge "Fix a remove*Listener call that doesn't remove" into rvc-dev am: a95a24a0a0 am: 6e9f2d2a65 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11837611

Change-Id: I26480648a5f1f6dc02ea5e3a633f4b127e47298e
 2020-06-12 16:28:30 +00:00
Jordan Jozwiak
7048655cbe Merge "DO NOT MERGE - Allow locking with feature or permission" into rvc-dev 2020-06-12 16:21:05 +00:00
TreeHugger Robot
1d21f39fef Merge "Don't throw exceptions in NotifCollection when initializing" into rvc-dev am: 8cf7a51d3d 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11847539

Change-Id: I98c594f46a1d80deddc7fccc91ce901ef1296a13
 2020-06-12 16:15:31 +00:00
TreeHugger Robot
c112078a27 Merge "Don't throw exceptions in NotifCollection when initializing" into rvc-dev am: 8cf7a51d3d 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11847539

Change-Id: Ia2a780fab71a535078ca92b4d80aedc8738810c0
 2020-06-12 16:15:23 +00:00
Neil Fuller
4054090215 Merge "Fix a remove*Listener call that doesn't remove" into rvc-dev am: a95a24a0a0 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11837611

Change-Id: Id1670738d112ea5f3f66ad89022ab044bd39e0ac
 2020-06-12 16:15:11 +00:00
Neil Fuller
6e9f2d2a65 Merge "Fix a remove*Listener call that doesn't remove" into rvc-dev am: a95a24a0a0 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11837611

Change-Id: I89abda8f1d673334d18e7a022c8db4de89ce09dc
 2020-06-12 16:14:48 +00:00
TreeHugger Robot
8cf7a51d3d Merge "Don't throw exceptions in NotifCollection when initializing" into rvc-dev 2020-06-12 16:04:58 +00:00
TreeHugger Robot
d7beefbc53 Merge "Controls UI - Correctly persist seeding state" into rvc-dev am: b278a5c4e4 am: c3b195a8e7 am: 12d3fa3276 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11817536

Change-Id: Ie93020c2f466b88ca524af684f3e89ccb37f2308
 2020-06-12 16:03:20 +00:00
Automerger Merge Worker
e734d96601 Merge "Merge "Controls UI - Correctly persist seeding state" into rvc-dev am: b278a5c4e4 am: 4e68b98b47" into rvc-d1-dev-plus-aosp am: 1940c40e47 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11817536

Change-Id: I07d8d8020cfe71d79160fbfad479d94081664821
 2020-06-12 16:03:08 +00:00
Automerger Merge Worker
1aa38316aa Merge "Merge "AudioService: fix volume group mute" into rvc-dev am: ff373b4676 am: dd01438a76 am: b9bcf5ee40" into rvc-qpr-dev-plus-aosp 2020-06-12 16:02:45 +00:00
Neil Fuller
a95a24a0a0 Merge "Fix a remove*Listener call that doesn't remove" into rvc-dev 2020-06-12 16:02:43 +00:00
TreeHugger Robot
4377b02809 Merge "Controls UI - Correctly persist seeding state" into rvc-dev am: b278a5c4e4 am: 4e68b98b47 am: 16299f8796 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11817536

Change-Id: Ib504a8dc6cdeb4a0ec5bc17c8296a1d3e94163a6
 2020-06-12 16:02:33 +00:00
Eric Laurent
183b735313 Merge "AudioService: fix volume group mute" into rvc-dev am: ff373b4676 am: dd01438a76 am: b9bcf5ee40 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11844163

Change-Id: I71ca7caec5eb1a07a2d98b15bcb8c7687c0c39f1
 2020-06-12 16:02:29 +00:00
Automerger Merge Worker
c4ba8ff1bb Merge "Merge "AudioService: fix volume group mute" into rvc-dev am: ff373b4676 am: 84049bf2f6 am: c71d7ab98c" into rvc-qpr-dev-plus-aosp 2020-06-12 16:02:06 +00:00
Eric Laurent
5f01d58ca8 Merge "AudioService: fix volume group mute" into rvc-dev am: ff373b4676 am: 84049bf2f6 am: 5967164eb0 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11844163

Change-Id: I58be04875c605129cb686e734895b3636e125f5a
 2020-06-12 16:01:50 +00:00
Eric Laurent
14e225b457 Merge "AudioService: fix volume group mute" into rvc-dev am: ff373b4676 am: 84049bf2f6 am: c71d7ab98c 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11844163

Change-Id: I84e7de576bce5097f0c5abd3bf7f8c3d38035759
 2020-06-12 16:01:48 +00:00
Matt Pietal
733d637879 Controls UI - Tap for NO_TEMPLATE 
Allow single taps as well as long press to launch the detail panel
when no template is specified.

Fixes: 158773087
Test: ControlsMockApp, any default type
Change-Id: I4d5451f6a5968d8dd223eb5b10d931ad60aad951
 2020-06-12 11:59:57 -04:00
TreeHugger Robot
12d3fa3276 Merge "Controls UI - Correctly persist seeding state" into rvc-dev am: b278a5c4e4 am: c3b195a8e7 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11817536

Change-Id: I36ac4ce1038ad95c459cd1b86ff9059095ad9956
 2020-06-12 15:50:01 +00:00
Automerger Merge Worker
1940c40e47 Merge "Merge "Controls UI - Correctly persist seeding state" into rvc-dev am: b278a5c4e4 am: 4e68b98b47" into rvc-d1-dev-plus-aosp 2020-06-12 15:49:59 +00:00
TreeHugger Robot
16299f8796 Merge "Controls UI - Correctly persist seeding state" into rvc-dev am: b278a5c4e4 am: 4e68b98b47 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11817536

Change-Id: I632c527a2db20c7384277ed7018dda72bcd0c262
 2020-06-12 15:49:47 +00:00
Eric Laurent
b9bcf5ee40 Merge "AudioService: fix volume group mute" into rvc-dev am: ff373b4676 am: dd01438a76 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11844163

Change-Id: I69641af5e02f7860af8ee8648963af7b0a74ab80
 2020-06-12 15:49:47 +00:00
TreeHugger Robot
bb91877668 Merge "Controls UI - Correctly persist seeding state" into rvc-dev am: b278a5c4e4 am: 4e68b98b47 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11817536

Change-Id: If8a96875ff904222fa81ffb582a9ef7f591280a3
 2020-06-12 15:49:46 +00:00
Eric Laurent
c71d7ab98c Merge "AudioService: fix volume group mute" into rvc-dev am: ff373b4676 am: 84049bf2f6 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11844163

Change-Id: I83cdded2c8ba788f6715b88c3cf07fd2f3c7c275
 2020-06-12 15:49:26 +00:00
Eric Laurent
5967164eb0 Merge "AudioService: fix volume group mute" into rvc-dev am: ff373b4676 am: 84049bf2f6 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11844163

Change-Id: Id95226fc88dd63db8bc73b106766f997ff29f6ba
 2020-06-12 15:49:13 +00:00
Mark Chien
88f2b816aa Revert "Pass entitlement configuration to Settings for entitlement check" 
Original CL has dependencies with unmerged settings change: https://googleplex-android-review.git.corp.google.com/c/platform/packages/apps/Settings/+/11524847
They should be in the same topic, revert it first. Will resume it and put the same with settings part CL.

This reverts commit b1cb53b481.

Reason for revert: This break hotspot because it should merged with settings part together.

Bug: 158836492

Change-Id: I94d3ee25168cfb3d125030654c4bb8ddd670abfc
 2020-06-12 15:29:39 +00:00
TreeHugger Robot
4e68b98b47 Merge "Controls UI - Correctly persist seeding state" into rvc-dev am: b278a5c4e4 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11817536

Change-Id: Ia349d51a176b04be64a3fcdca6e6155385ca2fe3
 2020-06-12 15:26:47 +00:00
TreeHugger Robot
c3b195a8e7 Merge "Controls UI - Correctly persist seeding state" into rvc-dev am: b278a5c4e4 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11817536

Change-Id: I61c17a9eacfb5a5a7413eb22e552553f45930548
 2020-06-12 15:26:34 +00:00
Eric Laurent
84049bf2f6 Merge "AudioService: fix volume group mute" into rvc-dev am: ff373b4676 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11844163

Change-Id: I7862c82a2cf9125f4147a19abbd13bd03d62dc7b
 2020-06-12 15:26:04 +00:00
Eric Laurent
dd01438a76 Merge "AudioService: fix volume group mute" into rvc-dev am: ff373b4676 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11844163

Change-Id: Idfe190bda150dd084914ca5698b4b18af022c6a5
 2020-06-12 15:25:53 +00:00
Matt Pietal
e4bd053414 Controls UI - Properly sort, and set default on seed 
When seeding is complete, set the default structure to the one with
the max number of controls. Tie breaker is first structure to have the
max. Also, sort the structures, not the serviceinfos.

Fixes: 158768701
Test: disable/enable Home app to test seeding
Change-Id: If5379943afc5ae7cd0d93464ad2e38c8eb01c7f3
 2020-06-12 11:25:13 -04:00
TreeHugger Robot
b278a5c4e4 Merge "Controls UI - Correctly persist seeding state" into rvc-dev 2020-06-12 15:16:27 +00:00