Fabian Kozynski
f482c100db
Merge "Use the correct user context in CustomTile" into rvc-dev
2020-02-28 19:05:17 +00:00
Jovana Knezevic
a0eed34ecb
Merge "Fixes switch-user -w command." into rvc-dev
2020-02-28 19:04:15 +00:00
Automerger Merge Worker
263b9bb956
Merge "Fix LogEventQueue_tests" into rvc-dev am: 06d2fe8d83 am: 5a63542032
...
Change-Id: Ib915b8147dc04ed9225e4d8d4dd130cd16253a83
2020-02-28 18:43:19 +00:00
Automerger Merge Worker
5a63542032
Merge "Fix LogEventQueue_tests" into rvc-dev am: 06d2fe8d83
...
Change-Id: Iacecb713447883bd440f5d098f73c9f64d4eca62
2020-02-28 18:32:33 +00:00
Ruchir Rastogi
06d2fe8d83
Merge "Fix LogEventQueue_tests" into rvc-dev
2020-02-28 18:20:07 +00:00
Yan Wang
be178769ad
iorap: Increase the JobScheduledEvent#TYPE_MAX to 1.
...
Fixes system_server crashes at the end of a job (in #onStopJob)
by correcting the MAX type number.
Bug: 148191073
Test: make
Change-Id: I12b0c65a0b3ad7ab3277a94f51fa2e71d323f862
(cherry picked from commit aa1ac93094 )
2020-02-28 18:08:46 +00:00
Yan Wang
6411a3353d
startop: Fix a bug in iorap functional test.
...
The prefetching work runs on another process.
Grep everything to workaround it.
Bug: 137403231
Test: atest iorap-functional-tests
Change-Id: Iac1796cb22f0db83ac5ebd78cb40e5cc5ac3a930
(cherry picked from commit 7d76f014eb )
2020-02-28 18:08:24 +00:00
Automerger Merge Worker
07d9461647
Merge "Prevent NPE in CustomTile" into rvc-dev am: c8bb1b3286 am: eed6a477c9
...
Change-Id: Iec018998c54701dc60c95906beea1bd3854a929a
2020-02-28 18:05:55 +00:00
Automerger Merge Worker
8248bda4d0
Merge "DisplayModeDirector: use configGroup when choosing default config" into rvc-dev am: 97ce4799af am: 86a7b2c344
...
Change-Id: I4684b589b66727b3aa79f8731f7a1c93cfd6d750
2020-02-28 18:05:44 +00:00
Automerger Merge Worker
eed6a477c9
Merge "Prevent NPE in CustomTile" into rvc-dev am: c8bb1b3286
...
Change-Id: Ib9b6e4c30f20589e848b9543ef64919b77df6ca8
2020-02-28 18:05:25 +00:00
Automerger Merge Worker
c21488b26e
Merge "Allow blocking calls to InstrumentationWatcher" into rvc-dev am: 9e0ea0c953 am: aafa4ff23a
...
Change-Id: I7c64c3419dd1a3100d5bce71ebc0465a1ee9d818
2020-02-28 18:05:03 +00:00
Igor Murashkin
a52f95e589
iorap: Increase timeout from 66sec to 30min for iorap-functional-tests
...
inode2filename is a bit slower now so it takes a while for the compiler
to finish. Increase timeout to compensate.
Bug: 150462358
Test: atest iorap-functional-tests
Change-Id: If1e017ad3c2c441b96dceadd91eb340fdf24302c
2020-02-28 10:01:59 -08:00
TreeHugger Robot
c8bb1b3286
Merge "Prevent NPE in CustomTile" into rvc-dev
2020-02-28 18:01:02 +00:00
Automerger Merge Worker
86a7b2c344
Merge "DisplayModeDirector: use configGroup when choosing default config" into rvc-dev am: 97ce4799af
...
Change-Id: If1c1812dea842b84cf3dc80d8d503367f3ff34bc
2020-02-28 17:45:57 +00:00
TreeHugger Robot
97ce4799af
Merge "DisplayModeDirector: use configGroup when choosing default config" into rvc-dev
2020-02-28 17:43:40 +00:00
Automerger Merge Worker
aafa4ff23a
Merge "Allow blocking calls to InstrumentationWatcher" into rvc-dev am: 9e0ea0c953
...
Change-Id: Id60143ec80602d5c27ee25606fcfa8a92ef12cd7
2020-02-28 17:40:42 +00:00
Rubin Xu
e07acdd3bf
Fix DevicePolicyManagerServiceMigrationTest
...
Fix: 149818286
Test: atest com.android.server.devicepolicy.DevicePolicyManagerServiceMigrationTest
Change-Id: I76846fb72c52017fbd6971a41e5dd218d6b9b327
2020-02-28 17:29:15 +00:00
Dmitri Plotnikov
9e0ea0c953
Merge "Allow blocking calls to InstrumentationWatcher" into rvc-dev
2020-02-28 17:29:13 +00:00
Automerger Merge Worker
f4379e2ec7
Merge "Battery saver dark mode bug" into rvc-dev am: b86cf15c28 am: 425ca93883
...
Change-Id: I839da0120ac4f818f6e31bdc36c3ff5f351fb94a
2020-02-28 17:12:09 +00:00
Automerger Merge Worker
4037d0200c
Merge "Fix Sharesheet grid items not aligned issue" into rvc-dev am: d113c5e037 am: 4aa308aff1
...
Change-Id: Iff33164f1c3a5bc4d3a2e4a1108350351be35716
2020-02-28 17:12:00 +00:00
Automerger Merge Worker
f9071c7b60
Merge "Generalize AutoHideController to be shared" into rvc-dev am: dfb1fe98af am: ddf2e56a2f
...
Change-Id: Ic713d8169f20c87ccab53168ef1f0fe7a82a7273
2020-02-28 17:11:47 +00:00
Automerger Merge Worker
31f20d99c7
Merge changes from topic "cp-networkscan-optimize" into rvc-dev am: 6c8486c771 am: ce6618e8b7
...
Change-Id: Ie6f4e94dcec880dc0c5da5f5ed4dba066c7895f8
2020-02-28 17:11:34 +00:00
Automerger Merge Worker
5c101bca76
Add Network Preference Bitmaps am: f4a9445a52 am: b7b6643c68
...
Change-Id: I57f06bf7e78d1978468388c38e92866944e77305
2020-02-28 17:11:32 +00:00
Automerger Merge Worker
c485760734
Merge "Updates destination bounds upon rotation change" into rvc-dev am: bfdc669666 am: fb92fcce62
...
Change-Id: Iad8cfb5d36c61bc5b57ba21d92f9b818c6f332f6
2020-02-28 17:11:08 +00:00
Automerger Merge Worker
542543a019
Merge "Fixed the GMM PiP window size" into rvc-dev am: 1a7d51051e am: a79d59c2d0
...
Change-Id: I81b877d3999b5c76224ac615260e8f618ee19d1a
2020-02-28 17:10:53 +00:00
Automerger Merge Worker
9f68caa935
Merge "Ignore flaky test" into rvc-dev am: b94fdf54c2 am: a108e00206
...
Change-Id: Ie25c49a38875aff5a9cc5717d7be4f7579026f7f
2020-02-28 17:10:26 +00:00
Automerger Merge Worker
425ca93883
Merge "Battery saver dark mode bug" into rvc-dev am: b86cf15c28
...
Change-Id: I98b0171e3cfb4a0c7f44564d7d7ea27075a57ee9
2020-02-28 17:10:02 +00:00
Jay Aliomer
b86cf15c28
Merge "Battery saver dark mode bug" into rvc-dev
2020-02-28 17:01:39 +00:00
Automerger Merge Worker
4aa308aff1
Merge "Fix Sharesheet grid items not aligned issue" into rvc-dev am: d113c5e037
...
Change-Id: I734c95b17e3ccfbd563e46124afb221be6dc7a68
2020-02-28 17:00:55 +00:00
Zhen Zhang
d113c5e037
Merge "Fix Sharesheet grid items not aligned issue" into rvc-dev
2020-02-28 16:59:05 +00:00
Automerger Merge Worker
ddf2e56a2f
Merge "Generalize AutoHideController to be shared" into rvc-dev am: dfb1fe98af
...
Change-Id: I464a72a6abe7108c053f0a1e67f978b2ba14ad8d
2020-02-28 16:56:54 +00:00
Automerger Merge Worker
ce6618e8b7
Merge changes from topic "cp-networkscan-optimize" into rvc-dev am: 6c8486c771
...
Change-Id: I12bbf890a9b9b372cad6a9bd8625c24616055121
2020-02-28 16:56:38 +00:00
Automerger Merge Worker
b7b6643c68
Add Network Preference Bitmaps am: f4a9445a52
...
Change-Id: I490e8287db92833f48337a51c80063a317481b01
2020-02-28 16:56:35 +00:00
Heemin Seog
dfb1fe98af
Merge "Generalize AutoHideController to be shared" into rvc-dev
2020-02-28 16:55:28 +00:00
Automerger Merge Worker
fb92fcce62
Merge "Updates destination bounds upon rotation change" into rvc-dev am: bfdc669666
...
Change-Id: Ibca5b79f2b505091cbe8be3c97eb9857c183b81d
2020-02-28 16:54:49 +00:00
Automerger Merge Worker
a79d59c2d0
Merge "Fixed the GMM PiP window size" into rvc-dev am: 1a7d51051e
...
Change-Id: I8f2b629db8c7283d2096a9962383062c7375310e
2020-02-28 16:54:30 +00:00
Automerger Merge Worker
a108e00206
Merge "Ignore flaky test" into rvc-dev am: b94fdf54c2
...
Change-Id: Icc7369e2e7d6b55d64ff77d707634074804feed2
2020-02-28 16:53:58 +00:00
Santiago Seifert
5a8c52786e
Fix some javadoc issues.
...
Bug: 150289352
Test: Javadoc change only.
Change-Id: Ifd5fc13072c3a30bdd36b960371339a86ebb13bb
2020-02-28 16:50:33 +00:00
Sarah Chin
6c8486c771
Merge changes from topic "cp-networkscan-optimize" into rvc-dev
...
* changes:
Remove NetworkClass from TelephonyManager
Add Network Preference Bitmaps
2020-02-28 16:48:41 +00:00
Hongwei Wang
bfdc669666
Merge "Updates destination bounds upon rotation change" into rvc-dev
2020-02-28 16:47:07 +00:00
Hongwei Wang
1a7d51051e
Merge "Fixed the GMM PiP window size" into rvc-dev
2020-02-28 16:46:51 +00:00
TreeHugger Robot
b94fdf54c2
Merge "Ignore flaky test" into rvc-dev
2020-02-28 16:38:42 +00:00
Automerger Merge Worker
c43c81018e
Merge "Fix testScreenCaptureDisabled" into rvc-dev am: 20905ec041 am: 04fadaadeb
...
Change-Id: I238944551d826918e589fe62fda08a865ea8bf73
2020-02-28 16:22:54 +00:00
Bernardo Rufino
dee28c91a3
Unify toast presentation code
...
Extract window layout construction and view inflation from Toast and
ToastUI into common @hide class ToastPresenter. This is desirable by
itself but also in preparation for making system toasts visible to all
users.
Bug: 149408635
Test: atest ToastUITest android.widget.cts.ToastTest
android.widget.cts29.ToastTest android.server.wm.ToastTest
Change-Id: Ifdd7ee37687da2e4c7abed61569cf342f95b2611
Merged-In: Ifdd7ee37687da2e4c7abed61569cf342f95b2611
(cherry picked from commit aea2c50cd8 )
2020-02-28 16:18:42 +00:00
Automerger Merge Worker
04fadaadeb
Merge "Fix testScreenCaptureDisabled" into rvc-dev am: 20905ec041
...
Change-Id: I509b6d1568e2cba4d54a218a63509a6e9ffee418
2020-02-28 16:09:37 +00:00
TreeHugger Robot
20905ec041
Merge "Fix testScreenCaptureDisabled" into rvc-dev
2020-02-28 15:54:52 +00:00
Automerger Merge Worker
c93056bcd0
Merge "Fix bug where screenshot jumped to the left" into rvc-dev am: aef754d253 am: 04a79624d9
...
Change-Id: I579aea56485f07df23ec39aca6c4f3d7076f1cac
2020-02-28 15:48:17 +00:00
Automerger Merge Worker
75c2a4985f
Merge "Ignore package mode for MANAGE_EXTERNAL_STORAGE" into rvc-dev am: ab2132d460 am: beb6c65e77
...
Change-Id: I7f609c3aa6c5a87e0504e63a90ee2c170b91874d
2020-02-28 15:48:01 +00:00
Automerger Merge Worker
3568f17c74
Merge "Fix mmap errors when reading font files via the AssetManager." into rvc-dev am: 8cf381064f am: a161f3f17d
...
Change-Id: I73e836c45743f96f966f9c9beaad2e8a7302ca68
2020-02-28 15:47:41 +00:00
Automerger Merge Worker
bf43824b27
Merge changes Ic91ff7ac,I7d118592 into rvc-dev am: b2c82a055e am: d3077295c9
...
Change-Id: If233dcb27be80d2b451d2487f62c750f3adf30d8
2020-02-28 15:46:50 +00:00