Beverly
4d22832cb1
Merge "Set min width of checkbox to 48dp" into qt-dev
...
am: f49ca51851
Change-Id: I03c6c1280d956594913ecbcfe787ff6b838cccd2
2019-04-22 14:27:23 -07:00
Chris Tate
6f6e0afb01
Merge "Remove spurious Slog.wtf()" into qt-dev
...
am: ef4c181a05
Change-Id: I9922562a664747ee6e16c10e045ccc16443cf6cf
2019-04-22 14:18:15 -07:00
Mathieu Chartier
fcfbc9c584
[automerger skipped] Merge "Disable iorap test mapping" am: 46b3d6d05d
...
am: 27ee83dca3 -s ours
am skip reason: change_id I17befa52ebad92413122253f692168cf93cbab6e with SHA1 6565a34d7f is in history
Change-Id: Id9ed8d34572fc3614337df49cfaaad8037351223
2019-04-22 14:10:59 -07:00
Mathieu Chartier
27ee83dca3
Merge "Disable iorap test mapping"
...
am: 46b3d6d05d
Change-Id: Ic644f166fee8f74818e03b8ec72cbae1756795bf
2019-04-22 14:01:38 -07:00
Android Build Merger (Role)
c474bb228f
Merge "Merge "add media.swcodec to native watchdog" into qt-dev am: a37cd55e10" into qt-dev-plus-aosp
2019-04-22 20:48:42 +00:00
Chong Zhang
a73e03c253
Merge "add media.swcodec to native watchdog" into qt-dev
...
am: a37cd55e10
Change-Id: I7931f79f51e58bac71389b5edc647d408f1e70cf
2019-04-22 13:47:17 -07:00
Benedict Wong
544c09a340
Merge "Add NATT keepalive resources and methods into IpSecService" am: c345527430
...
am: f8893a980f
Change-Id: I3affb5bdbb0c3f980b6606d728668e74c31646d0
2019-04-22 13:44:20 -07:00
Android Build Merger (Role)
9ec3245beb
Merge "Merge "Dynamically adjust renderahead" into qt-dev am: eecc52d796" into qt-dev-plus-aosp
2019-04-22 20:40:10 +00:00
John Reck
f75090436b
Merge "Dynamically adjust renderahead" into qt-dev
...
am: eecc52d796
Change-Id: Ia2d119abc0881eb85eae93a92cdebcf29482d3b1
2019-04-22 13:39:40 -07:00
Nick Kralevich
4caeabfa4d
Merge "Reduce cbrubaker bus factor by 2" am: 779be5e4a9
...
am: 16144f90f6
Change-Id: Id25a2f74fd12bc01de29b8ec6e24da1dc4ca383e
2019-04-22 13:38:46 -07:00
Treehugger Robot
46b3d6d05d
Merge "Disable iorap test mapping"
2019-04-22 20:38:24 +00:00
Benedict Wong
f8893a980f
Merge "Add NATT keepalive resources and methods into IpSecService"
...
am: c345527430
Change-Id: I97e7451959d619f42d68a5c29cca410bf0740852
2019-04-22 13:31:52 -07:00
Robert Snoeberger
3058706dae
Merge "Convert clock thumbnail images to transparent background." into qt-dev
...
am: c79a8e6746
Change-Id: If49b47e0e79f91d5eb328243a6e1dc05b5823822
2019-04-22 13:31:32 -07:00
Nick Kralevich
16144f90f6
Merge "Reduce cbrubaker bus factor by 2"
...
am: 779be5e4a9
Change-Id: I5400d13731580eb45137f3a548c89892e1176d5e
2019-04-22 13:26:19 -07:00
TreeHugger Robot
f49ca51851
Merge "Set min width of checkbox to 48dp" into qt-dev
2019-04-22 20:07:29 +00:00
Benedict Wong
c345527430
Merge "Add NATT keepalive resources and methods into IpSecService"
2019-04-22 20:03:54 +00:00
Treehugger Robot
779be5e4a9
Merge "Reduce cbrubaker bus factor by 2"
2019-04-22 19:56:25 +00:00
Chris Tate
ef4c181a05
Merge "Remove spurious Slog.wtf()" into qt-dev
2019-04-22 19:55:46 +00:00
Jack Yu
18c6d9db0e
Merge "Fixed that emergency alert dialog not popped up" into qt-dev
...
am: 2f1a44561f
Change-Id: Ide8a08e2851c787dc0317c9a164455d86468e886
2019-04-22 12:50:55 -07:00
GyeHun Jeon
9f74f30165
Merge "[wm] Fix smallestScreenWidthDp configuration on non default display (1/2)" into qt-dev
...
am: 604e253c9e
Change-Id: Ib5a6b65475f432266942c0389a491d28d6548828
2019-04-22 12:41:04 -07:00
Mathieu Chartier
6aaa03ab91
Disable iorap test mapping
...
Post submit tests are failing, disable the tests for now.
Bug: 123659771
Bug: 72170747
Bug: 130883339
Test: TH
(cherry picked from commit 6565a34d7f )
Merged-In: I17befa52ebad92413122253f692168cf93cbab6e
Change-Id: Ida6c6cb2ee30ebb08c959df83ae05fabb112d9c2
2019-04-22 12:38:00 -07:00
TreeHugger Robot
a37cd55e10
Merge "add media.swcodec to native watchdog" into qt-dev
2019-04-22 19:24:44 +00:00
John Reck
eecc52d796
Merge "Dynamically adjust renderahead" into qt-dev
2019-04-22 19:18:53 +00:00
zhouwenjie
661862d8e8
Merge "Fix UID tracking in ProcessCpuTracker." into qt-dev
...
am: 5c5e22e910
Change-Id: I789b3ec850fd484ffcbbae1b7e505d70fbc8f605
2019-04-22 11:58:16 -07:00
TreeHugger Robot
c79a8e6746
Merge "Convert clock thumbnail images to transparent background." into qt-dev
2019-04-22 18:53:19 +00:00
Yao Chen
5751725c80
Merge "Fix a bug in ProtoFileReader." into qt-dev
...
am: 28dd5f8486
Change-Id: I651aa08eda6ec997235678f1da4ccf33490b7682
2019-04-22 11:52:40 -07:00
TreeHugger Robot
2f1a44561f
Merge "Fixed that emergency alert dialog not popped up" into qt-dev
2019-04-22 18:47:01 +00:00
Robert Snoeberger
5f3d037663
Merge "Don't slide down "At a Glance" when notifs aren't visible." into qt-dev
...
am: de058b8e1b
Change-Id: If0fec20eafe23998ddc017b0490da66cc40a3638
2019-04-22 11:46:52 -07:00
TreeHugger Robot
604e253c9e
Merge "[wm] Fix smallestScreenWidthDp configuration on non default display (1/2)" into qt-dev
2019-04-22 18:46:26 +00:00
Kweku Adams
947bac3817
Merge "Fix QuotaController job spam throttling." into qt-dev
...
am: 95aeab0ac8
Change-Id: Ib891e23c8a147e1334ecb827833bd5cad9663f37
2019-04-22 11:41:22 -07:00
TreeHugger Robot
5c5e22e910
Merge "Fix UID tracking in ProcessCpuTracker." into qt-dev
2019-04-22 18:35:27 +00:00
TreeHugger Robot
28dd5f8486
Merge "Fix a bug in ProtoFileReader." into qt-dev
2019-04-22 18:34:39 +00:00
TreeHugger Robot
de058b8e1b
Merge "Don't slide down "At a Glance" when notifs aren't visible." into qt-dev
2019-04-22 18:26:37 +00:00
Kweku Adams
95aeab0ac8
Merge "Fix QuotaController job spam throttling." into qt-dev
2019-04-22 18:21:59 +00:00
Benedict Wong
e1bf9b05e6
Merge "Add configurability of LinkProperties, meteredness for Test Networks" am: 248cbf0025
...
am: 69a9326356
Change-Id: I9c8220efd56f72aabae028b48ac2f88ec7b8f659
2019-04-22 11:18:52 -07:00
Lei Yu
f07ca42ca8
Merge "Remove feature flag slice injection" into qt-dev
...
am: d7595947a8
Change-Id: Icb4bfe01c3d19aa2b7577c36be4e7a875f99b051
2019-04-22 11:09:38 -07:00
Benedict Wong
69a9326356
Merge "Add configurability of LinkProperties, meteredness for Test Networks"
...
am: 248cbf0025
Change-Id: I3ad0ccc7fefbd6bd8888cd1f3f396effcdbfdd3b
2019-04-22 11:07:43 -07:00
Kweku Adams
7d6a31c154
Fix QuotaController job spam throttling.
...
QuotaController was inadvertently updating all Timers for a particular
user whenever any process state crossed the FOREGROUND_SERVICE
threshold, instead of only updating the Timer for the specific UID.
Also adding more data to QuotaController's dump to make future debugging
easier.
Bug: 129117282
Test: atest com.android.server.job.controllers.QuotaControllerTest
Test: atest CtsJobSchedulerTestCases
Change-Id: Ic8d9e6478e61cc62318ae5651f0526e41a71de8d
2019-04-22 11:06:15 -07:00
Lei Yu
d7595947a8
Merge "Remove feature flag slice injection" into qt-dev
2019-04-22 17:49:52 +00:00
Winson Chung
e7de9d5574
Merge "Disconnect from overview service if process dies prior to connecting" into qt-dev
...
am: 6d38898c1d
Change-Id: I41f601ca76f49c75a83f65a2e3e40730b66059ca
2019-04-22 10:42:58 -07:00
Benedict Wong
248cbf0025
Merge "Add configurability of LinkProperties, meteredness for Test Networks"
2019-04-22 17:41:20 +00:00
Beverly
69234d7448
Set min width of checkbox to 48dp
...
Test: Accessibility Scanner
Fixes: 130775870
Change-Id: I7bf4b92d51d511551dd0aa7ac525d454b968b436
2019-04-22 13:36:27 -04:00
Andreas Gampe
96d79d6cb8
Merge "WmTests: Declare dependency on android.test.runner" into qt-dev
...
am: 705ea2baa7
Change-Id: Iac7a7d2be7ba94add4dca7d8d8cba155842e4436
2019-04-22 10:24:18 -07:00
Winson Chung
6d38898c1d
Merge "Disconnect from overview service if process dies prior to connecting" into qt-dev
2019-04-22 17:21:34 +00:00
TreeHugger Robot
705ea2baa7
Merge "WmTests: Declare dependency on android.test.runner" into qt-dev
2019-04-22 17:02:56 +00:00
Chris Craik
aba3db7dc5
Merge "Enable am profiling for apps profileable by shell" into qt-dev
...
am: 99f9d7c461
Change-Id: I67c524cfed78999c8088f543ff572ed166c0ba0a
2019-04-22 09:54:59 -07:00
Todd Kennedy
e6118a01f9
Merge "deprecate sharedUserId attribute" into qt-dev
...
am: 21dd05fd2c
Change-Id: I0de55a46380bfe36192be796415cea45c4539520
2019-04-22 09:44:16 -07:00
Chris Craik
99f9d7c461
Merge "Enable am profiling for apps profileable by shell" into qt-dev
2019-04-22 16:37:53 +00:00
TreeHugger Robot
21dd05fd2c
Merge "deprecate sharedUserId attribute" into qt-dev
2019-04-22 16:24:35 +00:00
Anil Admal
01ae92c4b8
Merge "Align GnssVisibilityControl location on/off with GnssLocationProvider" into qt-dev
...
am: 0d5dacc4e6
Change-Id: I427ec95134d25b69ba925dba52ea7bc9f8b02ede
2019-04-22 09:23:13 -07:00