Amy Zhang
6d81d76dec
Connect Filter Event Callback between the TunerService and TunerClient
...
Test: make libmedia_tv_tuner
Bug: 174095851
Change-Id: I11b372050428c3e600cea9f3d5cc6fee2d82399c
2021-02-01 13:34:18 -08:00
Amy Zhang
e0a71c1435
Merge "Improve documation of RestartEvent of Tuner Filter" into sc-dev
2021-02-01 19:00:25 +00:00
Keun-young Park
5d9b76bd83
[automerger skipped] Merge "Change setPrimaryStorageUuid to handle it for the current user" into rvc-qpr-dev am: 6c1e915306 am: f0544eadfb -s ours
...
am skip reason: Change-Id I87c821903987d22e8d26ade92120b99a33897168 with SHA-1 1c0e5ce8cf is in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13438906
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Icb1290ba575b77510329beb80d8332dd8a15f9ce
2021-02-01 18:28:04 +00:00
Tim Murray
df70c69e18
Merge changes Iaceb2b7c,I27aa4860,Ic650456a into sc-dev
...
* changes:
BackgroundDexOptService: defer post-boot job further
ActivityManagerService: don't compact system at BOOT_COMPLETED
CachedAppOptimizer: don't take AM lock when freezer is not enabled
2021-02-01 18:21:05 +00:00
TreeHugger Robot
0ac1939cd6
Merge "Flags for brightness slider" into sc-dev
2021-02-01 18:13:54 +00:00
Keun-young Park
f0544eadfb
Merge "Change setPrimaryStorageUuid to handle it for the current user" into rvc-qpr-dev am: 6c1e915306
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13438906
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I25ef90ea0542ebaa4ea300a6c43906e469a3b840
2021-02-01 18:00:09 +00:00
Chris Li
0838b40ec8
Merge "Allow non-resizable apps in split-screen (6/n)" into sc-dev
2021-02-01 17:49:52 +00:00
Tim Murray
01d09d2164
Merge "DynamicCodeLoggingService: avoid object churn" into sc-dev
2021-02-01 17:32:50 +00:00
Keun-young Park
2363cb6268
Merge "Change setPrimaryStorageUuid to handle it for the current user" into sc-dev
2021-02-01 17:27:02 +00:00
Keun-young Park
6c1e915306
Merge "Change setPrimaryStorageUuid to handle it for the current user" into rvc-qpr-dev
2021-02-01 17:26:53 +00:00
Sean Stout
87ddb99933
Merge "Update docs for PowerManager" into sc-dev
2021-02-01 17:22:47 +00:00
Lorenzo Colitti
f353805511
Merge "Revert "Expose IPsec tunnel APIs from @SystemApi to public APIs"" am: 5a700b2725 am: f681bee340 am: 7720b1f3d9
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1564979
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Id8e99aeefffddf88240cf5f1d7117e022242708f
2021-02-01 17:12:33 +00:00
TreeHugger Robot
3bdaabfc66
Merge "Put broadcast timekeeping on its own thread" into sc-dev
2021-02-01 17:12:02 +00:00
Lorenzo Colitti
7720b1f3d9
Merge "Revert "Expose IPsec tunnel APIs from @SystemApi to public APIs"" am: 5a700b2725 am: f681bee340
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1564979
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I324ea0a931e3b8da4b0bd11ef550312a21156f1f
2021-02-01 16:43:26 +00:00
Ryan Mitchell
b9c60d9ac1
Merge "Fix OverlayDeviceTests for un-rooted devices" into sc-dev
2021-02-01 16:23:48 +00:00
Fabian Kozynski
ca884932ad
Flags for brightness slider
...
Test: manual
Fixes: 178485354
Change-Id: If29f81a0089df6f0cc790fd140890eaba9359903
Merged-In: If29f81a0089df6f0cc790fd140890eaba9359903
2021-02-01 16:23:11 +00:00
Anton Hansson
4f7e0bc9e9
[automerger skipped] Merge changes If81cda01,I1df8b8e0 am: 3351717493 am: 389332a285 am: f90849a2d1 -s ours
...
am skip reason: Change-Id If81cda012b4627c8018ae54a0f0932ee39d6fd96 with SHA-1 c38a05e2bb is in history
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1566280
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Ia2e5d416f9c1ce2494fea1bd28fe6f8a0250bab8
2021-02-01 16:05:50 +00:00
Anton Hansson
713f5bec2f
[automerger skipped] Limit build visibility of modules in apex/... am: 096a1756fb am: 285c6a2018 am: 15278c6c7d -s ours
...
am skip reason: Change-Id I1df8b8e087d27f62ce8c09d7e6e32d511efdba6b with SHA-1 c7aa3f18f6 is in history
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1566279
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I632ebf39db3dc823bc5cd37bcfba70556dc0893a
2021-02-01 16:05:32 +00:00
Lorenzo Colitti
f681bee340
Merge "Revert "Expose IPsec tunnel APIs from @SystemApi to public APIs"" am: 5a700b2725
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1564979
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I147a86d5252f29a88d3a0fdb5c27d4c101791e7c
2021-02-01 16:04:06 +00:00
Lorenzo Colitti
5a700b2725
Merge "Revert "Expose IPsec tunnel APIs from @SystemApi to public APIs""
2021-02-01 15:33:11 +00:00
Anton Hansson
f90849a2d1
Merge changes If81cda01,I1df8b8e0 am: 3351717493 am: 389332a285
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1566280
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Id7c521e779ba55f7bea832ade8ff92d9465339bd
2021-02-01 15:21:06 +00:00
Anton Hansson
15278c6c7d
Limit build visibility of modules in apex/... am: 096a1756fb am: 285c6a2018
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1566279
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Ic00979a482e8ae725a57dee8c0e59b8dd296cad6
2021-02-01 15:21:02 +00:00
Anton Hansson
389332a285
Merge changes If81cda01,I1df8b8e0 am: 3351717493
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1566280
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I26af56f725ad03555b7991f51cfbebbbbdd758d7
2021-02-01 14:54:47 +00:00
Anton Hansson
285c6a2018
Limit build visibility of modules in apex/... am: 096a1756fb
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1566279
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Ie104a8cce24b86fe6dbea57119ee2a9090edb7ce
2021-02-01 14:50:38 +00:00
Anton Hansson
3351717493
Merge changes If81cda01,I1df8b8e0
...
* changes:
Suppress [CallbackInterface] metalava rule for mainline modules.
Limit build visibility of modules in apex/...
2021-02-01 14:02:20 +00:00
Neil Fuller
5e8177bf78
Merge "Add a constant for system_time to DeviceConfig" into sc-dev
2021-02-01 13:15:06 +00:00
Lorenzo Colitti
f82ebd7451
Merge changes Idcc9e32c,I58769bb7 am: d4caba4daf am: 2425886baa am: 4cb54827a0
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1552503
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I3d15c00910467d51531a25c025efb491b446b6a4
2021-02-01 12:41:24 +00:00
Mariia Sandrikova
bc1f09bdb3
Merge "Allow status and navigation bars to be semi-transparent in letterbox mode." into sc-dev
2021-02-01 12:38:12 +00:00
Nataniel Borges
283866d88d
Merge "Reduce flicker memory consumption (Pt 4)" into sc-dev
2021-02-01 12:22:01 +00:00
Lorenzo Colitti
4cb54827a0
Merge changes Idcc9e32c,I58769bb7 am: d4caba4daf am: 2425886baa
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1552503
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I309434985d7dc6c1cbcb411f6f08ebc4dc5d37d4
2021-02-01 12:20:27 +00:00
Riddle Hsu
725dae5c0e
Merge "Remove WM lock from the path of service operations" into sc-dev
2021-02-01 12:02:39 +00:00
Nicolas Geoffray
8e1bb092f5
[automerger skipped] Merge "Support for showing percent progress in boot animation." am: 87d840addd am: b86c3a3470 am: 8bd985efd4 -s ours
...
am skip reason: Change-Id I2d936e3391f56796308c90deb39ecacc58797721 with SHA-1 41fffb49d5 is in history
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1545805
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I7e651d602ae7c47963897190f11142ec8f5252ba
2021-02-01 11:39:20 +00:00
TreeHugger Robot
f801d4f9ba
[automerger skipped] Merge changes from topic "dmd_log_and_fix_rvc" into rvc-qpr-dev am: b72db4c52f am: 6564036dd7 -s ours
...
am skip reason: Change-Id Idcfcbfa9e41bb9a34e4808db6fdd7f8a5901457b with SHA-1 a1324f308b is in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13381993
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I22be26192818b57f185203e31c1e22bee8b4833c
2021-02-01 11:38:26 +00:00
raylinhsu
0440efcda4
[automerger skipped] Added to enable/disable log for DisplayModeDirector am: f6247e3d30 am: 9471fe8d50 -s ours
...
am skip reason: Change-Id I66478dda66d5d89193ef1838ab3afca94bf72313 with SHA-1 3bb0fbeaea is in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13372399
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I69593b71ac2502f3008072d3c9e79f409a52bc1f
2021-02-01 11:38:08 +00:00
Lorenzo Colitti
2425886baa
Merge changes Idcc9e32c,I58769bb7 am: d4caba4daf
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1552503
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: If12227f11585de18d92995cf603765b18f91764f
2021-02-01 11:36:03 +00:00
Remi NGUYEN VAN
09119c2ceb
resolve merge conflicts of 546e2e895f to sc-dev
...
Bug: None, merge conflict
Change-Id: Id07440d6a55111a1a7ddbf3df306f4466073fd1d
2021-02-01 11:29:28 +00:00
Nicolas Geoffray
8bd985efd4
Merge "Support for showing percent progress in boot animation." am: 87d840addd am: b86c3a3470
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1545805
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Ic4b699c54e725f6bde23d9f0123536bd2f0d6366
2021-02-01 11:02:58 +00:00
Lorenzo Colitti
d4caba4daf
Merge changes Idcc9e32c,I58769bb7
...
* changes:
Remove getFilteredNetworkState and add @NonNull in NetworkState.
Add test coverage for get*NetworkInfo on metered networks.
2021-02-01 10:56:19 +00:00
Nicolas Geoffray
b86c3a3470
Merge "Support for showing percent progress in boot animation." am: 87d840addd
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1545805
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I64c03c5c85c216eb739e482eca267c1dadd3169b
2021-02-01 10:26:21 +00:00
Tony Huang
d346ee5315
Merge "Make AppTransition animations sharable (1/n)" into sc-dev
2021-02-01 10:16:33 +00:00
Bernardo Rufino
bf1903d277
Merge "Open IM.getMaximumObscuringOpacityForTouch() and update docs." into sc-dev
2021-02-01 09:55:38 +00:00
Nicolas Geoffray
87d840addd
Merge "Support for showing percent progress in boot animation."
2021-02-01 09:51:30 +00:00
TreeHugger Robot
6564036dd7
Merge changes from topic "dmd_log_and_fix_rvc" into rvc-qpr-dev am: b72db4c52f
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13381993
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Ic87f4b68581208c48f3ee229adf978aeaee1d09e
2021-02-01 09:32:24 +00:00
raylinhsu
9471fe8d50
Added to enable/disable log for DisplayModeDirector am: f6247e3d30
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13372399
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I241ea5f3f2a05eefaed0f4e4a9c0488afe9437ee
2021-02-01 09:32:03 +00:00
Chalard Jean
bd3f6c2c1a
[automerger skipped] Merge "Start VcnManagementService after ConnectivityService" am: 1595b1aa38 am: 356c6725c6 am: 8cb7e186cd -s ours
...
am skip reason: Change-Id I1af29d52b94e77781eb2bf2082fcbe43648ee800 with SHA-1 3877b57b1d is in history
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1539845
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Ida8a39e087cb5e27307ac9100fe01111c4e7fd19
2021-02-01 09:20:08 +00:00
Calvin Pan
eee6428b80
Merge "Add TelephonyShellCommand to get EAB contact" am: d2d77dba7d am: e532d3be62 am: a0927df3f1
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1559096
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: If4e6ae901154e6d57117ff61095639e09bd29b7c
2021-02-01 09:19:44 +00:00
Alex Buynytskyy
3558f0d686
Merge "create owners" am: 00c3346e2d am: feaccc5be9 am: 9f3cfe4c82
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1565113
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Ic8273c33849e1b37f68ff1d63fde070092357ee4
2021-02-01 09:19:20 +00:00
Lorenzo Colitti
dcd9397730
Merge "Allow RNDIS and NCM to be enabled at the same time." am: 2836d8b703 am: 9db81cadec am: 677fbbbedc
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1559090
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Ia613275665e90be3e8fa00c0baa3d25823b61bd5
2021-02-01 09:18:59 +00:00
Jakub Pawlowski
d7f32dc5d9
Merge "resolve merge conflicts of 132a502721 to rvc-qpr-dev-plus-aosp" into rvc-qpr-dev-plus-aosp am: 9dd3a7b6a0
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13431733
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Ieaacca13ba75a2507c7f02ef4e988cd33703c1e1
2021-02-01 09:18:21 +00:00
Jing Ji
0074c31d36
Merge "Fix IndexOutOfBoundsException in process start timeout" into sc-dev
2021-02-01 08:56:53 +00:00