Trevor Black
eba137fd33
Merge "Add Vulkan 1.2 and 1.3 to getVulkanVersion()" into tm-dev am: 3f598fadcd am: d165a566ca
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17891135
Change-Id: I006ff53a69b97620ed3ec19f25e082406e2229ae
Ignore-AOSP-First: this is an automerge
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-25 05:41:19 +00:00
Trevor Black
d165a566ca
Merge "Add Vulkan 1.2 and 1.3 to getVulkanVersion()" into tm-dev am: 3f598fadcd
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17891135
Change-Id: Ia818cd811660c3d4dcbb8777a94d2bbcee9e225e
Ignore-AOSP-First: this is an automerge
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-25 05:26:10 +00:00
Trevor Black
3f598fadcd
Merge "Add Vulkan 1.2 and 1.3 to getVulkanVersion()" into tm-dev
2022-04-25 05:07:39 +00:00
Prabal Singh
b3bf25c7e7
Merge "Add util methods for WorkPolicy in SettingsLib" into tm-dev am: f69119a170 am: 07a1a862b1 am: 26d3593f60 am: e8c2d6cf33
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17907943
Change-Id: I68da63fdbd3a1a6ae86141303c4cbde59374b303
Ignore-AOSP-First: this is an automerge
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-25 04:44:52 +00:00
Chris Li
bfc0e0cae3
Merge "Fix transition wait when ActivityEmbedding enters PiP" into tm-dev am: 849cb51470 am: fc27dffd07 am: 8c0f27090f am: 9be12e45af
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17801185
Change-Id: If85ebf7d52ea29a20bca9b3b2b8bbf023d04607b
Ignore-AOSP-First: this is an automerge
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-25 04:44:15 +00:00
Prabal Singh
09b417f3c6
Merge "Add util methods for WorkPolicy in SettingsLib" into tm-dev am: f69119a170 am: d457d1847e am: 9801fccac8 am: 5c1792da47
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17907943
Change-Id: I892f8604cbf74948d5e1dfaa6bb28d44af0cc70f
Ignore-AOSP-First: this is an automerge
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-25 04:43:41 +00:00
Chris Li
5ec8352254
Merge "Fix transition wait when ActivityEmbedding enters PiP" into tm-dev am: 849cb51470 am: a3bbaf6718 am: b5f98cc43f am: a57ece057f
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17801185
Change-Id: Iaba1a4ad77b6bcb77a57afe9aadf1e0e09482a56
Ignore-AOSP-First: this is an automerge
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-25 04:43:13 +00:00
Prabal Singh
7370902019
Merge "Add util methods for WorkPolicy in SettingsLib" into tm-dev am: f69119a170 am: 07a1a862b1 am: f6c2cc9201 am: 1340cf9169
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17907943
Change-Id: I7094722477b90f642e8cab597aadbad63d043b5e
Ignore-AOSP-First: this is an automerge
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-25 04:42:27 +00:00
Chris Li
caf23ec58a
Merge "Fix transition wait when ActivityEmbedding enters PiP" into tm-dev am: 849cb51470 am: fc27dffd07 am: 8c70914e56 am: 1e995271bb
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17801185
Change-Id: I42967b88c4d8b6d59a609451bfd8ddff46e8f1dc
Ignore-AOSP-First: this is an automerge
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-25 04:41:37 +00:00
Prabal Singh
e8c2d6cf33
Merge "Add util methods for WorkPolicy in SettingsLib" into tm-dev am: f69119a170 am: 07a1a862b1 am: 26d3593f60
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17907943
Change-Id: Icff4c4a36bae9565e20ed5c4ef68847eb7427f00
Ignore-AOSP-First: this is an automerge
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-25 04:18:46 +00:00
Chris Li
9be12e45af
Merge "Fix transition wait when ActivityEmbedding enters PiP" into tm-dev am: 849cb51470 am: fc27dffd07 am: 8c0f27090f
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17801185
Change-Id: I9759a7ca342ae5b6d4c92532132270ea43f42775
Ignore-AOSP-First: this is an automerge
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-25 04:18:22 +00:00
Prabal Singh
5c1792da47
Merge "Add util methods for WorkPolicy in SettingsLib" into tm-dev am: f69119a170 am: d457d1847e am: 9801fccac8
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17907943
Change-Id: I47c7d3954e747f2479dbaa817c10fb5933502bfe
Ignore-AOSP-First: this is an automerge
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-25 04:18:14 +00:00
Chris Li
a57ece057f
Merge "Fix transition wait when ActivityEmbedding enters PiP" into tm-dev am: 849cb51470 am: a3bbaf6718 am: b5f98cc43f
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17801185
Change-Id: Ic5433a6b83c02f728c33a91c9c9d8c04353a0222
Ignore-AOSP-First: this is an automerge
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-25 04:17:22 +00:00
Prabal Singh
1340cf9169
Merge "Add util methods for WorkPolicy in SettingsLib" into tm-dev am: f69119a170 am: 07a1a862b1 am: f6c2cc9201
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17907943
Change-Id: Id7ff34fc2c922f2f47e311a6d561b25e2032b963
Ignore-AOSP-First: this is an automerge
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-25 04:16:57 +00:00
Chris Li
1e995271bb
Merge "Fix transition wait when ActivityEmbedding enters PiP" into tm-dev am: 849cb51470 am: fc27dffd07 am: 8c70914e56
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17801185
Change-Id: I0998576837952cf63df1e1a57062201290f70fe3
Ignore-AOSP-First: this is an automerge
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-25 04:16:43 +00:00
Prabal Singh
f6c2cc9201
Merge "Add util methods for WorkPolicy in SettingsLib" into tm-dev am: f69119a170 am: 07a1a862b1
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17907943
Change-Id: Ia844e045a3f6bc18aaac75c33306a24704396b2e
Ignore-AOSP-First: this is an automerge
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-25 03:54:53 +00:00
Prabal Singh
26d3593f60
Merge "Add util methods for WorkPolicy in SettingsLib" into tm-dev am: f69119a170 am: 07a1a862b1
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17907943
Change-Id: I988a4a7e62c382e49b60d985a0f3fcd70acee39c
Ignore-AOSP-First: this is an automerge
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-25 03:54:47 +00:00
Chris Li
8c70914e56
Merge "Fix transition wait when ActivityEmbedding enters PiP" into tm-dev am: 849cb51470 am: fc27dffd07
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17801185
Change-Id: Ic76a7cc6584917958ae584f10bd6d8a3f4227008
Ignore-AOSP-First: this is an automerge
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-25 03:54:46 +00:00
Prabal Singh
7e9ea3351e
Merge "Add util methods for WorkPolicy in SettingsLib" into tm-dev am: f69119a170 am: 4a4e842b20
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17907943
Change-Id: Id6b6d721293a2bbe8e97acce0cd5814129c6432a
Ignore-AOSP-First: this is an automerge
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-25 03:54:44 +00:00
Chris Li
8c0f27090f
Merge "Fix transition wait when ActivityEmbedding enters PiP" into tm-dev am: 849cb51470 am: fc27dffd07
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17801185
Change-Id: Iabc48684cd90ad1f475ac3b508c4136f0144addc
Ignore-AOSP-First: this is an automerge
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-25 03:54:40 +00:00
Prabal Singh
9801fccac8
Merge "Add util methods for WorkPolicy in SettingsLib" into tm-dev am: f69119a170 am: d457d1847e
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17907943
Change-Id: I3128c4fb1ca20beeb257ee7e03a3f19e6936816b
Ignore-AOSP-First: this is an automerge
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-25 03:54:35 +00:00
Chris Li
b5f98cc43f
Merge "Fix transition wait when ActivityEmbedding enters PiP" into tm-dev am: 849cb51470 am: a3bbaf6718
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17801185
Change-Id: I9a3b9a4cc71cc9ddc8e710df020c9e2fef1c93fb
Ignore-AOSP-First: this is an automerge
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-25 03:54:17 +00:00
Chris Li
1c3928de77
Merge "Fix transition wait when ActivityEmbedding enters PiP" into tm-dev am: 849cb51470 am: debbcadf03
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17801185
Change-Id: Ieb771615364eb214abaeceaae3bd5ad34c874125
Ignore-AOSP-First: this is an automerge
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-25 03:53:48 +00:00
Prabal Singh
07a1a862b1
Merge "Add util methods for WorkPolicy in SettingsLib" into tm-dev am: f69119a170
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17907943
Change-Id: I16fe120387738d6e6ac8ee9a3060fb188743c048
Ignore-AOSP-First: this is an automerge
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-25 03:25:30 +00:00
Prabal Singh
4a4e842b20
Merge "Add util methods for WorkPolicy in SettingsLib" into tm-dev am: f69119a170
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17907943
Change-Id: Ia3b6992772dddbb6fef34bd983365fdc0a905e77
Ignore-AOSP-First: this is an automerge
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-25 03:23:24 +00:00
Chris Li
fc27dffd07
Merge "Fix transition wait when ActivityEmbedding enters PiP" into tm-dev am: 849cb51470
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17801185
Change-Id: Ie7c657e41ba85ce62e88bf7d01d07b62d8e9b423
Ignore-AOSP-First: this is an automerge
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-25 03:23:00 +00:00
Prabal Singh
d457d1847e
Merge "Add util methods for WorkPolicy in SettingsLib" into tm-dev am: f69119a170
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17907943
Change-Id: I58d88c35fec0abc45d878779952fdd822aecb63d
Ignore-AOSP-First: this is an automerge
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-25 03:22:54 +00:00
Chris Li
a3bbaf6718
Merge "Fix transition wait when ActivityEmbedding enters PiP" into tm-dev am: 849cb51470
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17801185
Change-Id: Ic2836e4e603ba2bb182727f4bc8c4604552461da
Ignore-AOSP-First: this is an automerge
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-25 03:21:56 +00:00
Chris Li
debbcadf03
Merge "Fix transition wait when ActivityEmbedding enters PiP" into tm-dev am: 849cb51470
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17801185
Change-Id: Ic4e4d09aa6664b2f3e04daea49e00cb474511f7f
Ignore-AOSP-First: this is an automerge
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-25 03:21:25 +00:00
Prabal Singh
f69119a170
Merge "Add util methods for WorkPolicy in SettingsLib" into tm-dev
2022-04-25 03:17:01 +00:00
Chris Li
849cb51470
Merge "Fix transition wait when ActivityEmbedding enters PiP" into tm-dev
2022-04-25 02:46:53 +00:00
Sumedh Sen
359ec4dde3
Merge changes from topic "session-is-active"
...
* changes:
Testing status of session after requiring user action
Reactivate install session after user grants install permission
2022-04-25 02:26:57 +00:00
Jon Boekenoogen
6454d2f221
Merge "Installer package can call performDexOptMode"
2022-04-24 14:03:19 +00:00
Jon Boekenoogen
7c9923680a
Installer package can call performDexOptMode
...
Test: PlayStore installing itself can trigger dexopt manually
PlayStore with null installerPackageName cannot trigger
PlayStore with other installer package name cannot trigger
Change-Id: I9d10951bac84a7c53b9efd89da458982135d3659
2022-04-23 21:28:43 -07:00
Bill Yi
86ca571020
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-mainline-prod am: 0b8c7e2c70 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17837891
Change-Id: I40235c920eb19efdb7453bd9d49eda718ec89702
Ignore-AOSP-First: this is an automerge
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-24 00:18:43 +00:00
Bill Yi
906a3e3319
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 6341a72388 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17837891
Change-Id: I71612e29caebd42a55d549f0a3efe834e850583a
Ignore-AOSP-First: this is an automerge
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-24 00:18:20 +00:00
Bill Yi
b79dc301d2
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-mainline-prod am: 682641dd31 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17832006
Change-Id: Ie34e62913910f0fd5ccf455b386250e4927f1d90
Ignore-AOSP-First: this is an automerge
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-24 00:17:55 +00:00
Bill Yi
cf81341f3c
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: bc8a2de95d -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17832006
Change-Id: I3189562e75e1df709a21d8060ba17e415c2cb41b
Ignore-AOSP-First: this is an automerge
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-24 00:17:36 +00:00
Bill Yi
63c3f8f465
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-mainline-prod am: dca98af2d4 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17832004
Change-Id: Iefbe0ae0e52d209383ba982ad544c5d0cc420a31
Ignore-AOSP-First: this is an automerge
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-24 00:17:20 +00:00
Bill Yi
fa1bf0f027
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 188ab5caa6 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17832004
Change-Id: I0b815407ea66ae7e1d5bdb482e10a4c84675caf2
Ignore-AOSP-First: this is an automerge
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-24 00:16:58 +00:00
Bill Yi
57afe5f419
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-mainline-prod am: 95b64ad7e1 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17831863
Change-Id: I83b7805dd4902832f057d9c42ec3f9f63c7498bd
Ignore-AOSP-First: this is an automerge
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-24 00:16:35 +00:00
Bill Yi
f6bd09a577
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: a0fa613b65 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17831863
Change-Id: I2f676fc779e9f43f2c71b1baf9472babdc758a24
Ignore-AOSP-First: this is an automerge
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-24 00:16:14 +00:00
Bill Yi
5eedb3333e
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-mainline-prod am: 3cf326ba45 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17826877
Change-Id: I2397ea5623f23953e3564f0bd2090b02c3c8f231
Ignore-AOSP-First: this is an automerge
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-24 00:15:50 +00:00
Bill Yi
bb6411a841
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 210ec0fe26 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17826877
Change-Id: Ie044596fe694c2bbe289945a8a1e35cf6875b6c5
Ignore-AOSP-First: this is an automerge
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-24 00:15:10 +00:00
Bill Yi
0b8c7e2c70
Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-mainline-prod
2022-04-23 23:26:54 +00:00
Bill Yi
682641dd31
Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-mainline-prod
2022-04-23 23:26:54 +00:00
Bill Yi
dca98af2d4
Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-mainline-prod
2022-04-23 23:26:54 +00:00
Bill Yi
95b64ad7e1
Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-mainline-prod
2022-04-23 23:26:54 +00:00
Bill Yi
3cf326ba45
Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-mainline-prod
2022-04-23 23:26:54 +00:00
TreeHugger Robot
b7c31ada08
Merge "Use buffer to log media timeout events" into tm-dev am: 6037653177 am: e66d028cf3 am: bfbb01ebd7 am: bf4ca74b14
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17900544
Change-Id: I9eb55e0e8dd4ce1703e30c9fe5fac67ac58c89e9
Ignore-AOSP-First: this is an automerge
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-23 21:03:26 +00:00