Songchun Fan
03afc3cfcb
Merge "[metrics] log TotalDelayedReadsDurationMillis during ANR and Crash" into sc-dev am: 27d6aa2ec4 am: 3fe9d7256e
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14824025
Change-Id: Ifb572e836e3346c559b43752333bc5f35d02fc3c
2021-06-08 16:47:52 +00:00
Kyunglyul Hyun
50b18e9cd9
Merge "Bind provider services when necessary" into sc-dev am: a00481f6a6 am: 5509e63e4b
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14774944
Change-Id: Ie6daec08736016d5fd74b30d1c5769e4233962d4
2021-06-08 16:42:51 +00:00
Songchun Fan
bfc2f000a0
Merge "[metrics] log TotalDelayedReadsDurationMillis during ANR and Crash" into sc-dev am: 27d6aa2ec4 am: 4843872004
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14824025
Change-Id: Ic0f87c316523d122dd779bb65a38a12187d2fc10
2021-06-08 16:42:25 +00:00
Songchun Fan
3fe9d7256e
Merge "[metrics] log TotalDelayedReadsDurationMillis during ANR and Crash" into sc-dev am: 27d6aa2ec4
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14824025
Change-Id: I102af319ea727497539046aea2a14a4069cacb6c
2021-06-08 16:29:13 +00:00
Kyunglyul Hyun
5509e63e4b
Merge "Bind provider services when necessary" into sc-dev am: a00481f6a6
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14774944
Change-Id: Ie5391aff4a5fe16e747e14c978fd7c2bcc1bb082
2021-06-08 16:28:14 +00:00
Songchun Fan
4843872004
Merge "[metrics] log TotalDelayedReadsDurationMillis during ANR and Crash" into sc-dev am: 27d6aa2ec4
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14824025
Change-Id: I2330d558ab54536251c8121eddf113484774f63b
2021-06-08 16:27:35 +00:00
TreeHugger Robot
602fb84405
Merge "Fix ApkLite parsing namespace" into sc-dev am: e054e5445b am: 308414543d
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14888125
Change-Id: Ib52789a34e8c5dc78d7365f915a69b98df69c34f
2021-06-08 16:21:30 +00:00
TreeHugger Robot
f53e4a996a
Merge "Use StorageManager#isUserKeyUnlocked to determine CE storage in PMS" into sc-dev am: 6356acda6b am: 3377dd7fd1
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14804780
Change-Id: I3b6a8c117fd6783f81c3535ac83cf96b7f9814ae
2021-06-08 16:20:45 +00:00
TreeHugger Robot
8738c6d23f
Merge "Fix ApkLite parsing namespace" into sc-dev am: e054e5445b am: 116bc11f11
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14888125
Change-Id: Idd7892c29df4ee998bafc1f48be6bc5e0b7efd9e
2021-06-08 16:15:49 +00:00
TreeHugger Robot
392421f0fb
Merge "Use StorageManager#isUserKeyUnlocked to determine CE storage in PMS" into sc-dev am: 6356acda6b am: f478702644
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14804780
Change-Id: I26033294d78c6114a98adeec99291a948d8bd395
2021-06-08 16:14:41 +00:00
Kyunglyul Hyun
a00481f6a6
Merge "Bind provider services when necessary" into sc-dev
2021-06-08 16:12:15 +00:00
Songchun Fan
27d6aa2ec4
Merge "[metrics] log TotalDelayedReadsDurationMillis during ANR and Crash" into sc-dev
2021-06-08 16:06:24 +00:00
TreeHugger Robot
308414543d
Merge "Fix ApkLite parsing namespace" into sc-dev am: e054e5445b
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14888125
Change-Id: I8cf1baebb0b276b3dfdeefdfb85bc93857b5116a
2021-06-08 16:02:15 +00:00
TreeHugger Robot
3377dd7fd1
Merge "Use StorageManager#isUserKeyUnlocked to determine CE storage in PMS" into sc-dev am: 6356acda6b
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14804780
Change-Id: Iabf4658dfe7d81d687e574fe4f0a4c2ef73285f1
2021-06-08 16:01:56 +00:00
TreeHugger Robot
116bc11f11
Merge "Fix ApkLite parsing namespace" into sc-dev am: e054e5445b
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14888125
Change-Id: I0cbb98a869ca03d801fc4fe72c06f05919d59430
2021-06-08 15:59:17 +00:00
TreeHugger Robot
f478702644
Merge "Use StorageManager#isUserKeyUnlocked to determine CE storage in PMS" into sc-dev am: 6356acda6b
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14804780
Change-Id: I435f28af69cf18f5a9d4461193a1a156ec03e947
2021-06-08 15:58:42 +00:00
TreeHugger Robot
e054e5445b
Merge "Fix ApkLite parsing namespace" into sc-dev
2021-06-08 15:48:20 +00:00
TreeHugger Robot
6356acda6b
Merge "Use StorageManager#isUserKeyUnlocked to determine CE storage in PMS" into sc-dev
2021-06-08 15:46:30 +00:00
Nate Myren
219ea61d1f
Merge "TEMP add missing remap log, reduce log spam" into sc-dev am: ac6a92ff72 am: fb839299cc
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14881785
Change-Id: I808ac0bb4893c941336b4ef8eec6a5142c21bb0e
2021-06-08 15:40:47 +00:00
Nate Myren
779f132109
Merge "TEMP add missing remap log, reduce log spam" into sc-dev am: ac6a92ff72 am: 36d92b6228
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14881785
Change-Id: Idd0b737efe12534bbee6bbf3a6429e4194632139
2021-06-08 15:39:46 +00:00
Nate Myren
36d92b6228
Merge "TEMP add missing remap log, reduce log spam" into sc-dev am: ac6a92ff72
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14881785
Change-Id: Ib91e3d42e8608b9ccb7db2dcab70931fce0ad4dd
2021-06-08 15:26:48 +00:00
Nate Myren
fb839299cc
Merge "TEMP add missing remap log, reduce log spam" into sc-dev am: ac6a92ff72
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14881785
Change-Id: Ib561f646857e99db18b3d51c08abff8031cdd025
2021-06-08 15:23:15 +00:00
Nate Myren
ac6a92ff72
Merge "TEMP add missing remap log, reduce log spam" into sc-dev
2021-06-08 15:11:57 +00:00
Galia Peycheva
d23290a5f0
Merge "Increase char limit for blur dev option string" into sc-dev am: cf3e019bee am: f388e39ffb
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14891409
Change-Id: Ie429b761bec5dac90cffbdc712bb21114d0bc985
2021-06-08 14:42:19 +00:00
Calin Juravle
b7fb01b0bc
[automerger skipped] Merge "Add ART members to AndroidRuntime ownership" into sc-dev am: 1424a20e59 -s ours am: a5a44dd214 -s ours
...
am skip reason: Merged-In Ice016370ab5b4a5ce99ca118eaace55426643422 with SHA-1 f065a8df81 is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14885855
Change-Id: I2a4b0a59fd336ae232da726c79edaef201a4e324
2021-06-08 14:42:09 +00:00
Galia Peycheva
9641ddaab3
Merge "Increase char limit for blur dev option string" into sc-dev am: cf3e019bee am: 0b58b96581
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14891409
Change-Id: I5e1b5947764c381f9e7a180e74783646290368e8
2021-06-08 14:40:01 +00:00
Calin Juravle
0761e1672b
[automerger skipped] Merge "Add ART members to AndroidRuntime ownership" into sc-dev am: 1424a20e59 am: a6ec3ceddb -s ours
...
am skip reason: Merged-In Ice016370ab5b4a5ce99ca118eaace55426643422 with SHA-1 5c4aa4f2f7 is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14885855
Change-Id: I842a00bc2fbcd2ab8a1f532526561a776f4b9dd9
2021-06-08 14:39:48 +00:00
Galia Peycheva
0b58b96581
Merge "Increase char limit for blur dev option string" into sc-dev am: cf3e019bee
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14891409
Change-Id: Ie93c36b59667855e949ed95666977e45d7cc34c5
2021-06-08 14:27:26 +00:00
Calin Juravle
a6ec3ceddb
Merge "Add ART members to AndroidRuntime ownership" into sc-dev am: 1424a20e59
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14885855
Change-Id: Ica9574c7f5d2430df0ff52fb64a7d6d5da876a87
2021-06-08 14:27:13 +00:00
Galia Peycheva
f388e39ffb
Merge "Increase char limit for blur dev option string" into sc-dev am: cf3e019bee
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14891409
Change-Id: If3926a029e24c8ee020a22186b46ed4c69d81fb6
2021-06-08 14:23:22 +00:00
Calin Juravle
a5a44dd214
[automerger skipped] Merge "Add ART members to AndroidRuntime ownership" into sc-dev am: 1424a20e59 -s ours
...
am skip reason: Merged-In Ice016370ab5b4a5ce99ca118eaace55426643422 with SHA-1 5c4aa4f2f7 is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14885855
Change-Id: Ib01b92c9e30775017bb487da0d8676a1fbf8ebfd
2021-06-08 14:23:01 +00:00
Galia Peycheva
cf3e019bee
Merge "Increase char limit for blur dev option string" into sc-dev
2021-06-08 14:14:15 +00:00
Calin Juravle
1424a20e59
Merge "Add ART members to AndroidRuntime ownership" into sc-dev
2021-06-08 14:12:33 +00:00
Calin Juravle
f065a8df81
Add ART members to AndroidRuntime ownership
...
Test: m
Bug: 185979271
(cherry picked from commit 4f1be3a7b8c5e7899be5beba31ab0cc25a739c98)
Merged-In: Ice016370ab5b4a5ce99ca118eaace55426643422
Change-Id: Ice016370ab5b4a5ce99ca118eaace55426643422
2021-06-08 14:12:22 +00:00
Kholoud Mohamed
fb848217b7
Merge "Fix security vulnerability in DPMS" into sc-dev am: 209f21d2ae am: 01d13bb7ee
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14881810
Change-Id: I7119276b60d9859c9915b4051c1f7714a5bf13d6
2021-06-08 13:40:53 +00:00
Joanne Chung
5cb755c909
Merge "Dump the last Activity information when dumpsys translation" into sc-dev am: 1e5e988de4 am: 7a69a094fd
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14782677
Change-Id: I8705c370e5bc9aa3c1ceea3fad80a808846fe042
2021-06-08 13:40:35 +00:00
Kholoud Mohamed
afbebc4b6e
Merge "Fix security vulnerability in DPMS" into sc-dev am: 209f21d2ae am: f0f3ab11ea
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14881810
Change-Id: I930973f123f25dd3361a5ade10816ad74b57b0f4
2021-06-08 13:39:54 +00:00
Joanne Chung
fac8cd0845
Merge "Dump the last Activity information when dumpsys translation" into sc-dev am: 1e5e988de4 am: c9bddb2daa
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14782677
Change-Id: Ic296812a3cee9175e6c7df5801fcd899fd71c3c9
2021-06-08 13:39:45 +00:00
Kholoud Mohamed
f0f3ab11ea
Merge "Fix security vulnerability in DPMS" into sc-dev am: 209f21d2ae
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14881810
Change-Id: Icd65a15266764566d6c6b869b665b4cd4eea6e5d
2021-06-08 13:27:12 +00:00
Joanne Chung
c9bddb2daa
Merge "Dump the last Activity information when dumpsys translation" into sc-dev am: 1e5e988de4
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14782677
Change-Id: Ia056053022579fd3bb24bdb0215aa31ddd52a433
2021-06-08 13:26:23 +00:00
Kholoud Mohamed
01d13bb7ee
Merge "Fix security vulnerability in DPMS" into sc-dev am: 209f21d2ae
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14881810
Change-Id: I2b7a105b394125516bdcce470c9a5a77cd40760d
2021-06-08 13:24:24 +00:00
Joanne Chung
7a69a094fd
Merge "Dump the last Activity information when dumpsys translation" into sc-dev am: 1e5e988de4
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14782677
Change-Id: If4e45f50ea9dbcdacd6ef9bc959ce570830ac44a
2021-06-08 13:23:54 +00:00
Kholoud Mohamed
209f21d2ae
Merge "Fix security vulnerability in DPMS" into sc-dev
2021-06-08 13:17:37 +00:00
Joanne Chung
1e5e988de4
Merge "Dump the last Activity information when dumpsys translation" into sc-dev
2021-06-08 13:11:29 +00:00
Thales Lima
514f0a0b6b
Merge "sysui: show empty view in split mode" into sc-v2-dev am: 97c2b5d212
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14788432
Change-Id: If4fe14c6bbc6262e3e3f1e7cca203b1eef642553
2021-06-08 12:50:57 +00:00
Wei Sheng Shih
ed36d1b26a
Merge "Introduce setSplashscreenStyle to specify splash screen style." into sc-dev am: 6b0741b3fe am: e80879f307
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14609925
Change-Id: I73a9c0b78ae043898aca0ea122f831163fb87c2a
2021-06-08 12:50:17 +00:00
Wei Sheng Shih
1527f78219
Merge "Introduce setSplashscreenStyle to specify splash screen style." into sc-dev am: 6b0741b3fe am: b068266886
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14609925
Change-Id: I241c3561dc01aa6083e1ac2526efc1dac3576a55
2021-06-08 12:44:37 +00:00
Kyunglyul Hyun
920a676240
Bind provider services when necessary
...
The media router service bound media route provider
services only when there was a discovery request.
This prevented output switcher to work when there are only
legacy media router clients (i.e. apps that didn't enable MR2)
This CL makes the media router service binds media route provider
services when the MediaRouter2Manager#startScan is called
so that the output switcher can show cast sessions created by
the providers.
This CL also changes communication between the media router service and
the provider services as cast sessions can be created/released even when the
media router service is disconnected from media route provider.
Bug: 176774510
Test: manually
Change-Id: I481e1aa8f9dcc136cbf5788b9f66540708665af2
2021-06-08 12:42:54 +00:00
Thales Lima
97c2b5d212
Merge "sysui: show empty view in split mode" into sc-v2-dev
2021-06-08 12:35:50 +00:00
Wei Sheng Shih
e80879f307
Merge "Introduce setSplashscreenStyle to specify splash screen style." into sc-dev am: 6b0741b3fe
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14609925
Change-Id: I4fb4f4a78d02a77ee6df4450dfc84366c1eb513e
2021-06-08 12:29:50 +00:00