Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
485,519 Commits 3 Branches 0 Tags
69a5697ee2befe31d18651e6ea2a211b6d44994d
Commit Graph

485519 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
TreeHugger Robot
69a5697ee2 Merge "Notify window manager service that we are switching users" into rvc-dev am: 12b5186f28 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11821052

Change-Id: Ibc8f185b563c3f800bfbcba5882859946c85dc88
 2020-06-12 18:32:03 +00:00
Mady Mellor
f4734b2025 Merge "Fix an obscure NPE" into rvc-dev am: fe96fa8b19 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11844113

Change-Id: If843ec2ce532da2402a5ea96440543e00c7ed151
 2020-06-12 18:31:43 +00:00
Fabian Kozynski
09cb03f9a5 [automerger skipped] Merge "Add multi-user support for AutoTileManager" into rvc-dev am: 80e047bcbd -s ours 
am skip reason: Change-Id I518334cca0a0960e0b3b74b43ac9fce4610c7bd0 with SHA-1 31a266d5a3 is in history

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

Change-Id: If6a7b7e75cfbc4b0f22d17c664d5a630697c2fc3
 2020-06-12 18:31:14 +00:00
TreeHugger Robot
4ec759369e Merge "RebootEscrowManager: service-specific exceptions" into rvc-dev am: 26bc02ad4d 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11842173

Change-Id: Ie688bfc001c6cbd1b040513249b72bbf40d4c072
 2020-06-12 18:30:56 +00:00
TreeHugger Robot
3cb62293a9 Merge "Don't animate reorder/add when we're about to collapse." into rvc-dev am: f083c15656 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11852403

Change-Id: I17976f92d16be49f0a653b2987d48c6bfc2ae103
 2020-06-12 18:30:12 +00:00
TreeHugger Robot
12b5186f28 Merge "Notify window manager service that we are switching users" into rvc-dev 2020-06-12 18:21:20 +00:00
Mady Mellor
fe96fa8b19 Merge "Fix an obscure NPE" into rvc-dev 2020-06-12 18:20:44 +00:00
Fabian Kozynski
80e047bcbd Merge "Add multi-user support for AutoTileManager" into rvc-dev 2020-06-12 18:15:38 +00:00
TreeHugger Robot
26bc02ad4d Merge "RebootEscrowManager: service-specific exceptions" into rvc-dev 2020-06-12 18:15:22 +00:00
TreeHugger Robot
f083c15656 Merge "Don't animate reorder/add when we're about to collapse." into rvc-dev 2020-06-12 18:13:43 +00:00
TreeHugger Robot
38c9217417 Merge "Adding blur supported check to shared lib" into rvc-dev am: 7775314ff8 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11844114

Change-Id: I25a754c1507a879f498544361e78f64cea453375
 2020-06-12 18:07:47 +00:00
TreeHugger Robot
7775314ff8 Merge "Adding blur supported check to shared lib" into rvc-dev 2020-06-12 17:54:26 +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
322c525e6b Merge "Revert "Pass entitlement configuration to Settings for entitlement check"" into rvc-dev 2020-06-12 17:33:24 +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
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
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
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
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
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
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
7048655cbe Merge "DO NOT MERGE - Allow locking with feature or permission" into rvc-dev 2020-06-12 16:21:05 +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
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
Neil Fuller
a95a24a0a0 Merge "Fix a remove*Listener call that doesn't remove" into rvc-dev 2020-06-12 16:02:43 +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
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
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
TreeHugger Robot
b278a5c4e4 Merge "Controls UI - Correctly persist seeding state" into rvc-dev 2020-06-12 15:16:27 +00:00
Eric Laurent
ff373b4676 Merge "AudioService: fix volume group mute" into rvc-dev 2020-06-12 15:12:40 +00:00
Adrian Roos
cb32080a8f Settings: make SHOW_IME_WITH_HARD_KEYBOARD TestApi 
Bug: 158637229
Test: atest WindowInsetsAnimationControllerTests
Change-Id: Ic4e1c97e728aa170670356db22d66677710ac2a3
 2020-06-12 15:31:20 +02:00
Robert Snoeberger
1d31d572a3 Merge "Reject flings on seek bar" into rvc-dev am: 8140ae8d22 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11831680

Change-Id: I81e469393c91cbb60b55a34dcfc13dadd5d9581c
 2020-06-12 13:29:56 +00:00
Robert Snoeberger
8140ae8d22 Merge "Reject flings on seek bar" into rvc-dev 2020-06-12 13:15:06 +00:00
Kyunglyul Hyun
81d14d3d6e Merge "Handle a pair of hearing aid devcies" into rvc-dev am: 93e4930a97 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11833792

Change-Id: If329169388e283f656d0a379e935d995a8393ff7
 2020-06-12 13:06:40 +00:00
Kyunglyul Hyun
93e4930a97 Merge "Handle a pair of hearing aid devcies" into rvc-dev 2020-06-12 12:55:24 +00:00
Issei Suzuki
ca6e2b7211 Merge "Ensure to trigger Activity#onEnterAnimationComplete" into rvc-dev am: b749be45c7 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11838100

Change-Id: Id86cf8c2b0dd45d1205dd1d851636612401a5e47
 2020-06-12 11:43:59 +00:00
Issei Suzuki
b749be45c7 Merge "Ensure to trigger Activity#onEnterAnimationComplete" into rvc-dev 2020-06-12 11:31:55 +00:00
Neil Fuller
5fa4955154 Fix a remove*Listener call that doesn't remove 
Fix a remove*Listener call that doesn't remove the listener.

Bug: 158819132
Test: Build only
Merged-In: I67b57e8df8a6d39622999634cefdc267fc07ecae
Change-Id: I67b57e8df8a6d39622999634cefdc267fc07ecae
(cherry picked from commit 9a44590efa)
 2020-06-12 11:34:34 +01:00
Kyunglyul Hyun
f6d5b3c7c4 Handle a pair of hearing aid devcies 
This CL assigns the same ID for a pair of hearing aid devices and
filter out one of them.
It also fixes a potential system crash from BT devices having
the same hardware address.

Bug: 157708273
Test: cts test

Change-Id: Ia60623615ab1f4e931405f839b9f4110b463e51d
 2020-06-12 18:53:05 +09:00
TreeHugger Robot
617a72f3dc Merge "GnssStats atom entity name change" into rvc-dev am: 6dca466770 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11838738

Change-Id: Ia600d2ebd7d1a94f45d479f096fbb32f4e4a995e
 2020-06-12 08:32:03 +00:00
TreeHugger Robot
ea74ace506 Merge "Increase configs per uid limit to 20" into rvc-dev am: d4d283e67d 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11844170

Change-Id: Ia7d54f944eee5909b2da9d77dff0329ab9c59aea
 2020-06-12 08:31:42 +00:00
TreeHugger Robot
6dca466770 Merge "GnssStats atom entity name change" into rvc-dev 2020-06-12 08:17:59 +00:00
TreeHugger Robot
d4d283e67d Merge "Increase configs per uid limit to 20" into rvc-dev 2020-06-12 08:12:53 +00:00
Remi NGUYEN VAN
dccd3d6395 Merge "Remove IpClientCallbacks dependency on DhcpResults" into rvc-dev am: 0109b8da49 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11835422

Change-Id: I955833ccea9d29efac0d7e09bc6093f92da6b6ba
 2020-06-12 07:03:22 +00:00
TreeHugger Robot
f5615c9707 Merge "Reset app routes when global a2dp state changed" into rvc-dev am: 70b9d348eb 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11833779

Change-Id: I72d588033a05ae98efec9b4735e8cf9f5cdc1dda
 2020-06-12 07:02:28 +00:00
Remi NGUYEN VAN
0109b8da49 Merge "Remove IpClientCallbacks dependency on DhcpResults" into rvc-dev 2020-06-12 06:38:02 +00:00