Kevin Chyn
df1ae22403
Merge "Use StatusBar expansion instead of alpha to sync UDFPS animations" into sc-dev
2021-02-03 22:01:09 +00:00
Steven Moreland
1cf1bbe0e6
Merge "binder: race condition by parcel finalize" am: 52f933552a am: 5cb323c59e am: 2795e91f14
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1553275
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Iaac87c24d1acd513b9743e2630168c6e28ca7ebc
2021-02-03 21:56:04 +00:00
Miranda Kephart
6a2f6639f5
[automerger skipped] Merge "[DO NOT MERGE] Close screenshot process on user switched" into rvc-dev am: ec9dd28b39 am: a27a700887 am: 2660868cf4 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13071816
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I8fce488c3ba0b5d31da47ca544af7145272f9ee1
2021-02-03 21:55:39 +00:00
Miranda Kephart
3b6a80edd0
[automerger skipped] [DO NOT MERGE] Close screenshot process on user switched am: a5141a4b96 -s ours am: c70d040f48 am: 1177c0bb88 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13071816
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I8d772abfe7c7ca99549408a49346e058957f6ed7
2021-02-03 21:55:25 +00:00
Steven Moreland
2795e91f14
Merge "binder: race condition by parcel finalize" am: 52f933552a am: 5cb323c59e
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1553275
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Ic3edc89022f831d7d0301bdd4734e45b62c49649
2021-02-03 21:43:03 +00:00
Miranda Kephart
2660868cf4
Merge "[DO NOT MERGE] Close screenshot process on user switched" into rvc-dev am: ec9dd28b39 am: a27a700887
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13071816
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I514dad7c10a2d450e2d8d877213bd0a501eac0c7
2021-02-03 21:30:49 +00:00
Miranda Kephart
1177c0bb88
[automerger skipped] [DO NOT MERGE] Close screenshot process on user switched am: a5141a4b96 -s ours am: c70d040f48
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13071816
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Ie3e21261f65417fde0c78b96061c12edeb9b4eed
2021-02-03 21:30:33 +00:00
Bo Hu
d84462dfa5
Merge "[pm] reject installs of apks with renderscript on 64-bit only devices" into sc-dev
2021-02-03 21:18:20 +00:00
TreeHugger Robot
e10c0c05b1
Merge "Dependency injection of AssetProviders into ApkAssets" into sc-dev
2021-02-03 21:13:11 +00:00
TreeHugger Robot
455cbb77ce
Merge "Clarify this is a debug message only." into sc-dev
2021-02-03 21:04:59 +00:00
Kohsuke Yatoh
944681eda5
Merge "Split lock in FontManagerService." into sc-dev
2021-02-03 21:00:56 +00:00
Steven Moreland
5cb323c59e
Merge "binder: race condition by parcel finalize" am: 52f933552a
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1553275
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Idf3ca22d17f839736dea857ee34ec451b4def685
2021-02-03 20:59:40 +00:00
Miranda Kephart
a27a700887
Merge "[DO NOT MERGE] Close screenshot process on user switched" into rvc-dev am: ec9dd28b39
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13071816
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I223a724e33f676432d338c304775f1bd2092a8e0
2021-02-03 20:49:22 +00:00
Miranda Kephart
c70d040f48
[automerger skipped] [DO NOT MERGE] Close screenshot process on user switched am: a5141a4b96 -s ours
...
am skip reason: skipped by user mkephart
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13071816
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I596ca54fdfa4a36b4e45687f5d746db87d947d6c
2021-02-03 20:49:16 +00:00
Miranda Kephart
a5e22cf5ef
Merge "Fix screenshot behavior with display cutout" into sc-dev
2021-02-03 20:43:19 +00:00
Winson Chiu
3a1c63cf05
Merge "Re-codegen ScreenshotHash.java" into sc-dev
2021-02-03 20:41:51 +00:00
Winson
be547d0768
Re-codegen ScreenshotHash.java
...
This was merged without re-generating after a package move, causing
codegen to fail on local builds.
Bug: 179283345
Test: builds
Change-Id: I8a570105719b8ecf1fdc2ec0324ba5e7cf8dd445
2021-02-03 12:40:02 -08:00
Wale Ogunwale
7ae91f9d0e
Merge "Prep work for exposing split-screen APIs to Launcher" into sc-dev
2021-02-03 20:33:35 +00:00
Treehugger Robot
f4ee5731df
Merge "NetworkRegistrationInfo: add Parcel recycle" am: 9b899f7253 am: fbfe84846e am: 6d47e1ade5
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1569100
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I1804f92b9385ae2cf811b09faa24e68715e98880
2021-02-03 20:19:11 +00:00
Ying Xu
4b9744954c
Merge "Show the Ethernet Icon in the InternetTile" into sc-dev
2021-02-03 20:18:42 +00:00
Henry Fang
c6d4bc2b2c
Merge "TvInputHardwareManager: always try patch recreate if null" am: 59349e6d71 am: f69aecc91a am: 36610d336a
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1535783
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I122d5e6f6f7e0c1334528825e8f3e24148c4c00e
2021-02-03 20:18:08 +00:00
TreeHugger Robot
81f656e07f
Merge "Revert "Turn on the feature flag for Android S Settings."" into sc-dev
2021-02-03 20:12:00 +00:00
Treehugger Robot
6d47e1ade5
Merge "NetworkRegistrationInfo: add Parcel recycle" am: 9b899f7253 am: fbfe84846e
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1569100
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I09bbf36ee9b527fc610f01e557d44ed5c1d3df1b
2021-02-03 19:55:58 +00:00
Hall Liu
4edcb5272a
Merge "Rename setMobileDataPolicyEnabledStatus" into sc-dev
2021-02-03 19:54:14 +00:00
Henry Fang
36610d336a
Merge "TvInputHardwareManager: always try patch recreate if null" am: 59349e6d71 am: f69aecc91a
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1535783
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I3e5fcf5450c4fd5b217612e30e72448171035d53
2021-02-03 19:41:11 +00:00
Treehugger Robot
fbfe84846e
Merge "NetworkRegistrationInfo: add Parcel recycle" am: 9b899f7253
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1569100
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I46c1b1f79926e999deec5639c4e2a18f973e854b
2021-02-03 19:36:06 +00:00
Siddika Parlak Polatkan
40517bbf46
Merge "Add device orientation sensor logging" into sc-dev
2021-02-03 19:12:20 +00:00
Henry Fang
f69aecc91a
Merge "TvInputHardwareManager: always try patch recreate if null" am: 59349e6d71
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1535783
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I4cb4fc1c150698ef0f865e0733d417d2a187081f
2021-02-03 19:09:26 +00:00
Dmitri Plotnikov
df5ebd7eab
Merge "Calculate total power for a BatteryConsumer by adding up PowerComponents" into sc-dev
2021-02-03 19:06:15 +00:00
TreeHugger Robot
4fa23b75b1
Merge "Add constant values for MPEG-H." into sc-dev
2021-02-03 18:54:13 +00:00
Anna Zappone
c09fc8dd55
Merge "Update to different minWidth for testing 2x2" into sc-dev
2021-02-03 18:49:42 +00:00
Stevie Kideckel
ac2f0dbe00
Merge "Add support for time zones to AnalogClock" into sc-dev
2021-02-03 18:47:22 +00:00
Steven Moreland
52f933552a
Merge "binder: race condition by parcel finalize"
2021-02-03 18:46:50 +00:00
TreeHugger Robot
d98aa4eaa1
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev am: b74579eb2a -s ours am: bc8fd52fd9 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13470885
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Iebf9e52f0bccb08510eae79f71b707341014c947
2021-02-03 18:45:01 +00:00
TreeHugger Robot
276d3430e8
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev am: 62d3f3abb6 -s ours am: 4d72ea3d06 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13468772
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I23fe89a9b931a4e0ddf4f45083847271ad9920ef
2021-02-03 18:44:20 +00:00
TreeHugger Robot
9fb65e843e
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev am: 9946795ef4 -s ours am: a324a8ef22 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13468705
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: If2314b0f505f1264b934bbae4a0ae3a073ca7097
2021-02-03 18:43:13 +00:00
Treehugger Robot
d7737897f4
[automerger skipped] Merge changes from topic "limited_use_keys" am: 892c82e0f2 am: 0e30e1e432 am: 9ef6903141 -s ours
...
am skip reason: Change-Id I9620c4a3e5d2c10ed8a50d494e63eb2fb19dabef with SHA-1 fcb4e8ee2d is in history
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1513132
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I0cd24986102cacc1b22704b0ca4d1b60de5b98f8
2021-02-03 18:41:31 +00:00
Qi Wu
8e86213b02
[automerger skipped] Limited use key: feature flags. am: cd6c58acd8 am: 56e16a0208 am: 5e8ba3c736 -s ours
...
am skip reason: Change-Id Id9c13ee91b779164bd07ff20ae2b4c0e158fdb33 with SHA-1 e8af77951b is in history
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1552315
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I28e194493ca514dde72b3251892d851fdd526e2d
2021-02-03 18:41:20 +00:00
TreeHugger Robot
bc8fd52fd9
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev am: b74579eb2a -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13470885
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I547d23e267293d28b1db456b32d3a8e8879b8a04
2021-02-03 18:39:39 +00:00
TreeHugger Robot
4d72ea3d06
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev am: 62d3f3abb6 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13468772
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I7960866f977e0e30dcb30a5d93c13b0c00b85608
2021-02-03 18:39:28 +00:00
TreeHugger Robot
a324a8ef22
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev am: 9946795ef4 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13468705
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I5489dd9592a5edf7cf18a7a743b390b37300bd8c
2021-02-03 18:39:06 +00:00
Ryan Mitchell
1a48fa659b
Dependency injection of AssetProviders into ApkAssets
...
Creates ApkAssets creation methods that allow an AssetsProvider to be
specified.
During idmap verification and creation, idmap2 currently opens the
target package and overlay package several times:
1) When the crc of the package is calculated in idmap2 verify
2) When the manifest of an overlay is parsed
3) When an ApkAssets is opened.
Opening large zip files (like framework-res.apk) is slow. If we opened
the zip one time as an ApkAssets, the resources.arsc would have to be
parsed (which means mmaping/unmapping and touching a lot of
resources.arsc pages). This would cause idmap2 to preform unnecessary
work just to check the crc of some files.
This change allows a ZipAssetsProvider to be created and then moved
for the creation of an ApkAssets. The zip file only needs to be opened
once and the resources.arsc is not parsed until reading resources is
actually necessary.
Bug: 172471315
Test: libandroidfw_tests
Test: CtsResourcesLoaderTests
Change-Id: I940bb2c13844c7f028776a623a9ecef45a4813bf
2021-02-03 10:38:24 -08:00
Treehugger Robot
9b899f7253
Merge "NetworkRegistrationInfo: add Parcel recycle"
2021-02-03 18:31:07 +00:00
Henry Fang
59349e6d71
Merge "TvInputHardwareManager: always try patch recreate if null"
2021-02-03 18:16:01 +00:00
Hui Yu
43cadf3129
Clarify this is a debug message only.
...
The "Background started FGS" is a debug message, use Slog.wtfQuiet() to
log the message.
Bug: 174699413
Test: build and run.
Change-Id: I5ad4acb1a474ddb219c36537f7e616a7e09506c7
2021-02-03 10:13:18 -08:00
TreeHugger Robot
b74579eb2a
Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev
2021-02-03 18:12:12 +00:00
Fan Zhang
5ad13e0c25
Revert "Turn on the feature flag for Android S Settings."
...
This reverts commit 0197d41019 .
Reason for revert: DroidMonitor: Potential culprit for Bug 179262029 - verifying through Forrest before revert submission. This is part of the standard investigation process, and does not mean your CL will be reverted.
Change-Id: Ifed6374b417d10ca76c3c2805ac985282174b367
2021-02-03 18:11:54 +00:00
TreeHugger Robot
1135dae87a
Merge "Keyguard SIM PIN: Fix height" into sc-dev
2021-02-03 18:11:38 +00:00
TreeHugger Robot
a10132d763
Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev
2021-02-03 18:10:29 +00:00
Marcin Oczeretko
81ed6656ba
Merge "Use PerfettoTrigger to trigger traces from LatencyTracker" into sc-dev
2021-02-03 18:07:04 +00:00