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
Automerger Merge Worker
a55cfbad8f Merge "Merge "Merge "Add mutual exclusion access for addOrUpdateStream and removeStream" am: af108c45d6 am: 760c2bccd2 am: bd580a07b4 am: 91e082a90d am: 7f6cc71fe5" into rvc-dev am: d32c56d24d am: fddf37de68" into rvc-d1-dev-plus-aosp am: 5a14dec252 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11697200

Change-Id: I1b2cae2a962cd5d59d0b361d8de38dc5d2bc7ece
 2020-06-12 17:52:54 +00:00
TreeHugger Robot
1509ada3fe Merge "Controls UI - Tap for NO_TEMPLATE" into rvc-dev am: d6fb5e2151 am: df58dcf081 am: 05b0ccb2ec 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11850954

Change-Id: I63811642bbbf60e747d43f29c2f4b936706a4bc2
 2020-06-12 17:52:32 +00:00
Automerger Merge Worker
0b686d7595 Merge "Merge "Merge "Add mutual exclusion access for addOrUpdateStream and removeStream" am: af108c45d6 am: 760c2bccd2 am: bd580a07b4 am: 91e082a90d am: 7f6cc71fe5" into rvc-dev am: d32c56d24d am: 8298d0590b" into rvc-d1-dev-plus-aosp am: f1a593037a 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11697200

Change-Id: I72773a7932addbfc131e6e6bb1061c3913f18448
 2020-06-12 17:52:08 +00:00
TreeHugger Robot
88cd93e514 Merge "Settings: make SHOW_IME_WITH_HARD_KEYBOARD TestApi" into rvc-dev am: 7883b53e28 am: 147c54f9a0 am: 9f1878bee0 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11838104

Change-Id: Ia9f579f9cbc758e7c39691f148aa933fe3387d13
 2020-06-12 17:51:41 +00:00
TreeHugger Robot
640033d5be Merge "Settings: make SHOW_IME_WITH_HARD_KEYBOARD TestApi" into rvc-dev am: 7883b53e28 am: 42c810bd0b am: 47e564965b 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11838104

Change-Id: Ifc23e6f3e14e08e05022b0a0e4b740a5bd161e6b
 2020-06-12 17:51:10 +00:00
TreeHugger Robot
2a0a156fe7 Merge "Controls UI - Tap for NO_TEMPLATE" into rvc-dev am: d6fb5e2151 am: df58dcf081 am: c3d1ff26ef 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11850954

Change-Id: I55c4fb22b993856f0470d203322bb1f85aa579eb
 2020-06-12 17:46:18 +00:00
TreeHugger Robot
22ed5fb8bd Merge "Merge "Add mutual exclusion access for addOrUpdateStream and removeStream" am: af108c45d6 am: 760c2bccd2 am: bd580a07b4 am: 91e082a90d am: 7f6cc71fe5" into rvc-dev am: d32c56d24d am: 8298d0590b am: 9231ff703e 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11697200

Change-Id: Ie1240313ae684bb419902416920df243e67a82c9
 2020-06-12 17:46:01 +00:00
Mark Chien
dfae0aad30 Merge "Revert "Pass entitlement configuration to Settings for entitlement check"" into rvc-dev am: 322c525e6b 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11836348

Change-Id: Ifa96dbf15a2c96b7c1fc9af39c8270707864470b
 2020-06-12 17:45:43 +00:00
Mark Chien
faf2d5524b Merge "Revert "Pass entitlement configuration to Settings for entitlement check"" into rvc-dev am: 322c525e6b 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11836348

Change-Id: I9436ba6a4fe7ef3eb38316d831e047957302bc49
 2020-06-12 17:45:36 +00:00
TreeHugger Robot
9c0f429dc5 Merge "Settings: make SHOW_IME_WITH_HARD_KEYBOARD TestApi" into rvc-dev am: 7883b53e28 am: 42c810bd0b am: 9d8332613a 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11838104

Change-Id: I7179ff57b899a67561422a8cdfb97e60a655fc31
 2020-06-12 17:45:34 +00:00
Hui Yu
08b71f2d95 Remove obsolete string resource. 
Code that uses the string resource has been deleted.

Bug: 148587527, 148586972
Test: NA.
Change-Id: I3af114d721400242cab213b7afe2ac44483c8475
 2020-06-12 17:43:08 +00:00
Shuo Qian
6775b77bd5 Change the threshold for RSSNR from 10*db to db 
Test: SignalStrengthTest
Bug: 158539126
Change-Id: I9bc4b2f601d7d3f2a32ca34768ecb2a78d59d5bb
 2020-06-12 17:39:37 +00:00
Kweku Adams
8604fd74ff Offload initial headless app query to handler thread. 
Query package manager for the headless system app check on the handler
thread to avoid impacting boot time.

Bug: 157941190
Test: verify cache is still populated
Change-Id: Idb446e68c0ad4e1e693b45297d5297be855849bf
 2020-06-12 10:37:45 -07:00
TreeHugger Robot
4913eb2f6b Merge "Controls UI - Tap for NO_TEMPLATE" into rvc-dev am: d6fb5e2151 am: d7c6a998a1 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11850954

Change-Id: Ib422942997c0593d32aa758e573b54c5db12238b
 2020-06-12 17:34:29 +00:00
TreeHugger Robot
c3d1ff26ef Merge "Controls UI - Tap for NO_TEMPLATE" into rvc-dev am: d6fb5e2151 am: df58dcf081 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11850954

Change-Id: Iefb5de778bdc89a1ec8d50b44b849fce5f9eb809
 2020-06-12 17:34:13 +00:00
Automerger Merge Worker
5a14dec252 Merge "Merge "Merge "Add mutual exclusion access for addOrUpdateStream and removeStream" am: af108c45d6 am: 760c2bccd2 am: bd580a07b4 am: 91e082a90d am: 7f6cc71fe5" into rvc-dev am: d32c56d24d am: fddf37de68" into rvc-d1-dev-plus-aosp 2020-06-12 17:33:59 +00:00
TreeHugger Robot
9231ff703e Merge "Merge "Add mutual exclusion access for addOrUpdateStream and removeStream" am: af108c45d6 am: 760c2bccd2 am: bd580a07b4 am: 91e082a90d am: 7f6cc71fe5" into rvc-dev am: d32c56d24d am: 8298d0590b 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11697200

Change-Id: Icddc16e458cdca472eb376ccfefdb0b3c91b0b11
 2020-06-12 17:33:53 +00:00
TreeHugger Robot
05b0ccb2ec Merge "Controls UI - Tap for NO_TEMPLATE" into rvc-dev am: d6fb5e2151 am: df58dcf081 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11850954

Change-Id: I2189ec938349b613c9089f414c34ef237e521a9b
 2020-06-12 17:33:49 +00:00
TreeHugger Robot
48afaa9568 Merge "Merge "Add mutual exclusion access for addOrUpdateStream and removeStream" am: af108c45d6 am: 760c2bccd2 am: bd580a07b4 am: 91e082a90d am: 7f6cc71fe5" into rvc-dev am: d32c56d24d am: fddf37de68 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11697200

Change-Id: I2364a030a734057bb98f5fac10e66208d9b2d0cd
 2020-06-12 17:33:39 +00:00
Automerger Merge Worker
f1a593037a Merge "Merge "Merge "Add mutual exclusion access for addOrUpdateStream and removeStream" am: af108c45d6 am: 760c2bccd2 am: bd580a07b4 am: 91e082a90d am: 7f6cc71fe5" into rvc-dev am: d32c56d24d am: 8298d0590b" into rvc-d1-dev-plus-aosp 2020-06-12 17:33:37 +00:00
TreeHugger Robot
d4f270f966 Merge "Merge "Add mutual exclusion access for addOrUpdateStream and removeStream" am: af108c45d6 am: 760c2bccd2 am: bd580a07b4 am: 91e082a90d am: 7f6cc71fe5" into rvc-dev am: d32c56d24d am: 8298d0590b 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11697200

Change-Id: Ie8584fdb08a00723484256fa46bfb067db8c4746
 2020-06-12 17:33:25 +00:00
Mark Chien
322c525e6b Merge "Revert "Pass entitlement configuration to Settings for entitlement check"" into rvc-dev 2020-06-12 17:33:24 +00:00
TreeHugger Robot
9f1878bee0 Merge "Settings: make SHOW_IME_WITH_HARD_KEYBOARD TestApi" into rvc-dev am: 7883b53e28 am: 147c54f9a0 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11838104

Change-Id: I1e46c794e90487b0166a5fc74bf975fc7cc28f25
 2020-06-12 17:33:18 +00:00
TreeHugger Robot
9d8332613a Merge "Settings: make SHOW_IME_WITH_HARD_KEYBOARD TestApi" into rvc-dev am: 7883b53e28 am: 42c810bd0b 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11838104

Change-Id: I3a5b41c6d40b5b31429a5cd9c1cf306df9a554e5
 2020-06-12 17:33:08 +00:00
TreeHugger Robot
47e564965b Merge "Settings: make SHOW_IME_WITH_HARD_KEYBOARD TestApi" into rvc-dev am: 7883b53e28 am: 42c810bd0b 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11838104

Change-Id: Id5c822de5a74a31d153a48c1cbeb390f2676a182
 2020-06-12 17:32:58 +00:00
TreeHugger Robot
d7c6a998a1 Merge "Controls UI - Tap for NO_TEMPLATE" into rvc-dev am: d6fb5e2151 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11850954

Change-Id: Ic31dc28b6a6139ea0b2d9af5576b2fad9e091386
 2020-06-12 17:22:55 +00:00
TreeHugger Robot
df58dcf081 Merge "Controls UI - Tap for NO_TEMPLATE" into rvc-dev am: d6fb5e2151 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11850954

Change-Id: I13e5ed74ac82b79a7b72511b55c02cb6ad4c6573
 2020-06-12 17:22:24 +00:00
TreeHugger Robot
fddf37de68 Merge "Merge "Add mutual exclusion access for addOrUpdateStream and removeStream" am: af108c45d6 am: 760c2bccd2 am: bd580a07b4 am: 91e082a90d am: 7f6cc71fe5" into rvc-dev am: d32c56d24d 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11697200

Change-Id: I286cf502d23a94593b6436c0dc281edfda6a60ae
 2020-06-12 17:22:20 +00:00
TreeHugger Robot
8298d0590b Merge "Merge "Add mutual exclusion access for addOrUpdateStream and removeStream" am: af108c45d6 am: 760c2bccd2 am: bd580a07b4 am: 91e082a90d am: 7f6cc71fe5" into rvc-dev am: d32c56d24d 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11697200

Change-Id: I798ba177a5daaf4242f4934f36b437b0c681558b
 2020-06-12 17:22:03 +00:00
TreeHugger Robot
d6fb5e2151 Merge "Controls UI - Tap for NO_TEMPLATE" into rvc-dev 2020-06-12 17:21:21 +00:00
TreeHugger Robot
d32c56d24d Merge "Merge "Add mutual exclusion access for addOrUpdateStream and removeStream" am: af108c45d6 am: 760c2bccd2 am: bd580a07b4 am: 91e082a90d am: 7f6cc71fe5" into rvc-dev 2020-06-12 17:21:01 +00:00
Miranda Kephart
5d4cb837cc Revert "Post a silent notification if screenshot is dismissed" 
This reverts commit c0841cf102.

Reason for revert: We no longer want to post a notification, due
to concerns about UI consistency.

Bug: 158854375
Fix: 158854375
Test: manual

Change-Id: Icb01a9afe7118580082c31f993265e243c9a5db7
 2020-06-12 13:19:55 -04:00
Automerger Merge Worker
cf1c61de46 Merge changes from topic "am-df7bac20f576499eb8b154f337e435d2" into rvc-qpr-dev-plus-aosp 
* changes:
  Merge "DO NOT MERGE - Allow locking with feature or permission" into rvc-dev am: 7048655cbe am: 6f60371228 am: fe4534b304
  DO NOT MERGE - Allow locking with feature or permission am: 9ead5a3c05 am: 1c71776f9b am: 5f60fd793e
 2020-06-12 17:16:57 +00:00
TreeHugger Robot
147c54f9a0 Merge "Settings: make SHOW_IME_WITH_HARD_KEYBOARD TestApi" into rvc-dev am: 7883b53e28 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11838104

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

Change-Id: I9404107ba334ebbcbdddd50876446ed7b5323878
 2020-06-12 17:16:41 +00:00
TreeHugger Robot
42c810bd0b Merge "Settings: make SHOW_IME_WITH_HARD_KEYBOARD TestApi" into rvc-dev am: 7883b53e28 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11838104

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

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

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

Change-Id: I422bcf6f5f8f1fed53e72fd93a75375cd3c0c425
 2020-06-12 17:16:17 +00:00
Beth Thibodeau
7a1721ad71 Check connection state of media browser 
We need to verify that the browser is actually connected before calling
getRoot or getSessionToken, otherwise it will throw an exception (and
crash sysui).

This is not typical but could happen if the service we connected to had
some problem and disconnected soon after we got the onConnected callback

Bug: 156104922
Test: atest com.android.systemui.media

Change-Id: I9b73e2167612a287b527c7bf7bdba1ca2455d55b
 2020-06-12 13:11:15 -04:00
Miranda Kephart
33aff26285 Check for null service in ScreenshotHelper 
We were testing whether mScreenshotConnection was null as a proxy
for whether we had a running screenshot service. In principle
mScreenshotService should never be null if mScreenshotConnection
is not null, but it's safer to check. This may fix the crash noticed in
early May (attached bug), and either way is better for the stability
of the process.

Bug: 156366251
Fix: 156366251
Test: manual
Change-Id: Iea669a5a2ca2334760141ec6fec8ec7ffb01f25c
 2020-06-12 13:04:18 -04:00
Josh Tsuji
d12d46a51e Don't animate reorder/add when we're about to collapse. 
Fixes: 158658744
Test: expand the stack, select a different bubble, collapse the stack, observe no weird bubble swapping behavior
Test: add a bubble while expanded, observe the bubbles still animate around as expected
Change-Id: I585c0ed139d38e57e19014971259bc32787b9f35
 2020-06-12 12:57:10 -04:00
Jordan Jozwiak
3c38b25d42 Merge "DO NOT MERGE - Allow locking with feature or permission" into rvc-dev am: 7048655cbe am: 5756ae944f 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11739858

Change-Id: I852cd55e4769167beff603f4a6b0e7b0005944df
 2020-06-12 16:45:35 +00:00
Jordan Jozwiak
fe4534b304 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: I689e8cab41516429d605fa0cf1374521b280f04d
 2020-06-12 16:45:30 +00:00
Jordan Jozwiak
d140dfb3ff DO NOT MERGE - Allow locking with feature or permission am: 9ead5a3c05 am: a50847e505 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11739858

Change-Id: I971be58e4d2a2b6e53b1b8c07b4f6f59dffbe12e
 2020-06-12 16:45:28 +00:00
Jordan Jozwiak
5f60fd793e 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: I3f3e54e9d74a8b4ff6e843e014b2d226ebf1e44b
 2020-06-12 16:45:26 +00:00
TreeHugger Robot
7883b53e28 Merge "Settings: make SHOW_IME_WITH_HARD_KEYBOARD TestApi" into rvc-dev 2020-06-12 16:44:44 +00:00
Jordan Jozwiak
1b5d76404d Merge "DO NOT MERGE - Allow locking with feature or permission" into rvc-dev am: 7048655cbe am: 6f60371228 am: 7d48d460c0 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11739858

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

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

Change-Id: I22bc8dbba0d6d00267b74f7f1aafa4668ee02c20
 2020-06-12 16:41:21 +00:00