Gustav Sennton
f4cd2edfda
Merge "SSIN: Use the application's context to load icon resources." into qt-qpr1-dev
...
am: 0df74f4d32
Change-Id: I8d2e42641acec393343196acdf5ec96d26dba405
2019-09-19 15:20:48 -07:00
Dave Mankoff
c507eb7ae2
Merge "Add new ProximitySensor wrapper that automatically uses appropriate sensor." into qt-qpr1-dev
...
am: a9667ff3ab
Change-Id: Idc3b5781ff6fc84086a9094bce64958c0985bad9
2019-09-19 15:16:32 -07:00
TreeHugger Robot
0df74f4d32
Merge "SSIN: Use the application's context to load icon resources." into qt-qpr1-dev
2019-09-19 22:01:07 +00:00
Dave Mankoff
a9667ff3ab
Merge "Add new ProximitySensor wrapper that automatically uses appropriate sensor." into qt-qpr1-dev
2019-09-19 21:54:03 +00:00
Mingguang Xu
db114da8a5
Merge "Wifi usability: Change the unit of the threshold for tx/rx throughput from Mbps to Kbps" into qt-qpr1-dev
...
am: a295feab37
Change-Id: Ib759afbf288649cea7f2f4ca39bfef8eb88fc17c
2019-09-19 14:37:50 -07:00
Mingguang Xu
a295feab37
Merge "Wifi usability: Change the unit of the threshold for tx/rx throughput from Mbps to Kbps" into qt-qpr1-dev
2019-09-19 21:06:44 +00:00
Hui Yu
4c2857b0ed
Merge "Add jji@google.com to am/OWNERS file." am: f26f9b3f80 am: 8ee26f2461
...
am: 054a4d67d7
Change-Id: Ice503479b772ebf74d4156c2b5eeb34f23efe315
2019-09-19 13:59:22 -07:00
Hui Yu
054a4d67d7
Merge "Add jji@google.com to am/OWNERS file." am: f26f9b3f80
...
am: 8ee26f2461
Change-Id: Ib22605c7abeb814df529cb12a55905bbeb2ddc1d
2019-09-19 13:52:22 -07:00
Hui Yu
8ee26f2461
Merge "Add jji@google.com to am/OWNERS file."
...
am: f26f9b3f80
Change-Id: I21412ceaed3bd57f51912e1d52bada0597227998
2019-09-19 13:45:46 -07:00
Treehugger Robot
f26f9b3f80
Merge "Add jji@google.com to am/OWNERS file."
2019-09-19 20:22:35 +00:00
Eric Laurent
e34b12d69b
Merge "SoundTriggerHelper: fix state after audioserver death" into qt-qpr1-dev
...
am: e5a3106cc5
Change-Id: I93be2df0ceb65fa2b78ea73d9d2cca679afd2f26
2019-09-19 11:50:36 -07:00
Eric Laurent
e5a3106cc5
Merge "SoundTriggerHelper: fix state after audioserver death" into qt-qpr1-dev
2019-09-19 18:28:31 +00:00
Bill Yi
62173d1e91
[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-qpr1-dev
...
am: 403c841eed -s ours
am skip reason: subject contains skip directive
Change-Id: Ia5c58414f4aa229595fa6588ce1a2329f7c5f383
2019-09-19 11:17:25 -07:00
TreeHugger Robot
403c841eed
Merge "Import translations. DO NOT MERGE" into qt-qpr1-dev
2019-09-19 17:57:35 +00:00
Android Build Merger (Role)
48670a21f7
Merge "Merge "Acquire display suspend blocker for DozeService" into qt-dev am: 576a6f4ac5 am: 23da52265b am: b2125a7195" into qt-qpr1-dev-plus-aosp
2019-09-19 15:23:37 +00:00
Santos Cordon
5d506b5520
Merge "Acquire display suspend blocker for DozeService" into qt-dev am: 576a6f4ac5 am: 23da52265b
...
am: b2125a7195
Change-Id: Ia66421176fcd0064dcd2bd3eafeaff4975318607
2019-09-19 08:23:01 -07:00
Santos Cordon
0b3e8ed1c6
Merge "Acquire display suspend blocker for DozeService" into qt-dev am: 576a6f4ac5 am: 23da52265b
...
am: 467c2c4466
Change-Id: I7a382548f083ebc373845b5160200314311db1d0
2019-09-19 08:22:28 -07:00
Santos Cordon
467c2c4466
Merge "Acquire display suspend blocker for DozeService" into qt-dev am: 576a6f4ac5
...
am: 23da52265b
Change-Id: I22cdada6cae5a726ab159e8ecc0d99e379216921
2019-09-19 08:16:01 -07:00
Santos Cordon
b2125a7195
Merge "Acquire display suspend blocker for DozeService" into qt-dev am: 576a6f4ac5
...
am: 23da52265b
Change-Id: Ic09e1264f90a41e51018a849949a3bc45a23735b
2019-09-19 08:16:01 -07:00
Santos Cordon
23da52265b
Merge "Acquire display suspend blocker for DozeService" into qt-dev
...
am: 576a6f4ac5
Change-Id: I75471698513cfc72c87f0149d4da891d7156fa3b
2019-09-19 08:08:30 -07:00
TreeHugger Robot
576a6f4ac5
Merge "Acquire display suspend blocker for DozeService" into qt-dev
2019-09-19 14:50:10 +00:00
Evan Laird
24b43ec870
Merge "DO NOT MERGE: Revert "Force FGS notifications to show for a minimum time"" into qt-qpr1-dev
...
am: a05396b249
Change-Id: I1636c99fa7962cce2f78f9794224537011c1f3c0
2019-09-19 07:30:26 -07:00
Evan Laird
23a4c82a62
DO NOT MERGE: Revert "Force FGS notifications to show for a minimum time"
...
am: 7c6df8dad1
Change-Id: I30774ee4835a9be8617894e2b32698ed7944ae0f
2019-09-19 07:30:24 -07:00
Winson Chung
3f0b334926
Merge "Exposing flickerlib classes and layer tracing to sysui" am: e25075b2fb am: f19fcb5048
...
am: 8832611d4f
Change-Id: I0b0e2b1f094b29cc445e5347aa8af81da1b08bf8
2019-09-19 07:17:25 -07:00
TreeHugger Robot
a05396b249
Merge "DO NOT MERGE: Revert "Force FGS notifications to show for a minimum time"" into qt-qpr1-dev
2019-09-19 14:13:57 +00:00
Winson Chung
8832611d4f
Merge "Exposing flickerlib classes and layer tracing to sysui" am: e25075b2fb
...
am: f19fcb5048
Change-Id: I281764bab937ff4a71ed0572a648e4f08738a5d9
2019-09-19 07:09:21 -07:00
Jiyong Park
a02ab098db
Merge "Use filter_packages to unbunden metalava" am: 385291c36d am: 14698c6e71
...
am: 382aaf00de
Change-Id: I28239c5cd46d5772bddc3f2f2e76f10e5a7cc171
2019-09-19 06:55:35 -07:00
Winson Chung
f19fcb5048
Merge "Exposing flickerlib classes and layer tracing to sysui"
...
am: e25075b2fb
Change-Id: I182eef2c7f93d68bcdceaec3fcdfaf9615eda0ea
2019-09-19 06:55:30 -07:00
Jiyong Park
382aaf00de
Merge "Use filter_packages to unbunden metalava" am: 385291c36d
...
am: 14698c6e71
Change-Id: I000c42b8e9633e7f0df8e633c90c9c0315260f61
2019-09-19 06:48:15 -07:00
Treehugger Robot
e25075b2fb
Merge "Exposing flickerlib classes and layer tracing to sysui"
2019-09-19 13:42:49 +00:00
Jiyong Park
14698c6e71
Merge "Use filter_packages to unbunden metalava"
...
am: 385291c36d
Change-Id: I89244f4468f97145e1f82ecd61ebbc7114bef968
2019-09-19 06:41:20 -07:00
Treehugger Robot
385291c36d
Merge "Use filter_packages to unbunden metalava"
2019-09-19 13:24:46 +00:00
Evan Laird
7c6df8dad1
DO NOT MERGE: Revert "Force FGS notifications to show for a minimum time"
...
This reverts commit 09843a687b .
Reason for revert: There is possible reentrant behavior when posting the safeToRemove callback after a FGS has been canceled/reposted
Bug: 140948482
Change-Id: I2c5b9135e57a87f412dce8c167147dcb38f6bbae
2019-09-19 13:09:06 +00:00
Ricky Wai
7f9b7e38da
Merge "Do not return synthetic launcher activity for completely headless apps" into qt-qpr1-dev
...
am: 275b7c1d73
Change-Id: Ifd60f1aad3f77c54990b75f174f717d518e69594
2019-09-19 03:44:30 -07:00
Ricky Wai
275b7c1d73
Merge "Do not return synthetic launcher activity for completely headless apps" into qt-qpr1-dev
2019-09-19 10:26:13 +00:00
Bill Yi
c1f18d2647
Import translations. DO NOT MERGE
...
Change-Id: Ia59167fa6651dcbb24c9422864985b5fe58526f7
Auto-generated-cl: translation import
2019-09-19 02:44:14 -07:00
Daniel Rosenberg
2dc14bc0ae
Merge "Use mContext directly, and enforce via logging" into qt-qpr1-dev
...
am: 0ed64776ea
Change-Id: I2b138ee6c466144f7d4beb4770c9936878f33e8f
2019-09-19 02:03:17 -07:00
Paul Lawrence
88079b3398
Merge "Revert "Use mContext directly"" into qt-qpr1-dev
...
am: 1f129a115a
Change-Id: I778957f291926806ede70fa9b3f39270f419714a
2019-09-19 02:03:11 -07:00
TreeHugger Robot
0ed64776ea
Merge "Use mContext directly, and enforce via logging" into qt-qpr1-dev
2019-09-19 08:41:37 +00:00
TreeHugger Robot
1f129a115a
Merge "Revert "Use mContext directly"" into qt-qpr1-dev
2019-09-19 08:41:37 +00:00
Mingguang Xu
078fe45552
Wifi usability: Change the unit of the threshold for tx/rx throughput from Mbps to Kbps
...
Data stall event can be triggered if the tx/rx tput is consecutively below a threshold over multiple RSSI polls. Changing the unit of the threshold from Mbps to Kbps allows us to configure a value below 1Mbps, e.g., 400Kbps.
Bug: 141027476
Test: frameworks/base/wifi/tests/runtests.sh
Signed-off-by: Mingguang Xu <mingguangxu@google.com >
Change-Id: Ib7b398fb6975c0d03b09550db9bf68a2bb8bddfb
Merged-In: I76d6338cd2d482d198fde1e5a2d1a0540c087ca6
2019-09-19 07:42:34 +00:00
Victor Hsieh
24c2c60951
Merge "Mirror fs-verity ownership UID to Java" am: d6b817cd51 am: 9b83a708c7
...
am: 1863e70b22
Change-Id: I8d5669350ff2d000957e2c603f6b9ab255bbdade
2019-09-18 18:27:18 -07:00
Victor Hsieh
1863e70b22
Merge "Mirror fs-verity ownership UID to Java" am: d6b817cd51
...
am: 9b83a708c7
Change-Id: I7b2abbeebb247b1690d0692151739d4428f9a7b0
2019-09-18 18:15:40 -07:00
Android Build Merger (Role)
834dad1f5b
Merge "Merge "No need to use getExpandedBubble for singleTaskDisplayDrawn/Empty callbacks" into qt-qpr1-dev am: 4ac6a113ed" into qt-qpr1-dev-plus-aosp
2019-09-19 01:05:39 +00:00
Mady Mellor
1e5da3f8e0
Merge "No need to use getExpandedBubble for singleTaskDisplayDrawn/Empty callbacks" into qt-qpr1-dev
...
am: 4ac6a113ed
Change-Id: I2dd8ce7f5f95bdebaacf91b7f6c9b9230acc3fc8
2019-09-18 18:04:50 -07:00
Kevin Hufnagle
bc50edef36
Merge "docs: Add condition for hiding synth. activities" into qt-dev am: 00537efd07 am: 12298403b0
...
am: 2bac1d7287
Change-Id: I2a11a5f6f8879d98019cd07c3f721a8efeca9be2
2019-09-18 18:04:37 -07:00
Victor Hsieh
9b83a708c7
Merge "Mirror fs-verity ownership UID to Java"
...
am: d6b817cd51
Change-Id: I996e62ddb8b8c24d9af52cf870e670986a0aa0a6
2019-09-18 18:04:36 -07:00
Kevin Hufnagle
84b5194c1c
Merge "docs: Add condition for hiding synth. activities" into qt-dev am: 00537efd07 am: 12298403b0
...
am: c67e4da871
Change-Id: I7d478b8c7a1071961d8e2b365e9bd2c25c62e450
2019-09-18 17:45:34 -07:00
TreeHugger Robot
4ac6a113ed
Merge "No need to use getExpandedBubble for singleTaskDisplayDrawn/Empty callbacks" into qt-qpr1-dev
2019-09-19 00:40:59 +00:00
Kevin Hufnagle
c67e4da871
Merge "docs: Add condition for hiding synth. activities" into qt-dev am: 00537efd07
...
am: 12298403b0
Change-Id: I7a71cdb8fd5ecfd008d0e8257185cdd8c5366ce0
2019-09-18 17:39:27 -07:00