Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
640,425 Commits 3 Branches 0 Tags
8093fd207c855f2069da4da2132a3ea335193e24
Commit Graph

640425 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Jieru Shi
8093fd207c Merge "Add SMARTSPACE_CARD_RENDERED for media card" into sc-dev 2021-05-11 22:01:01 +00:00
TreeHugger Robot
7e12f3e9d5 Merge "Fix negative freezer timeout" into sc-dev 2021-05-11 21:46:41 +00:00
Hui Wang
373c69331c [automerger skipped] Merge "Update the format of RCS provisioning config XML" am: fb0990fa0a am: 1b8695828d am: 7d68f0d274 -s ours 
am skip reason: Merged-In I7df3c660326c6bee3db4a4d3a032ce8f1941b15b with SHA-1 e5017913a4 is already in history

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1695125

Change-Id: I16e810ec5313f0e39a6b3e502d0800d2da718d18
 2021-05-11 21:21:22 +00:00
Aurimas Liutikas
4c9b195cae Merge "Fix incompatibilities with Kotlin 1.5.0" am: 600dcaf908 am: 70ba49b0e5 am: c61fdfd2d1 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1697314

Change-Id: I4c76908e0cf9a1ba0493322c1f8dedb4fa925e80
 2021-05-11 21:20:45 +00:00
Hui Wang
7d68f0d274 Merge "Update the format of RCS provisioning config XML" am: fb0990fa0a am: 1b8695828d 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1695125

Change-Id: I4a01cbda145a09ef30302718dedc14d54238fd40
 2021-05-11 21:19:39 +00:00
Alexander Dorokhine
59ea888741 Merge "Update framework from jetpack." into sc-dev 2021-05-11 21:19:30 +00:00
Miranda Kephart
d8c5bcdf9f Merge "Implement transition long screenshots->markup" into sc-dev 2021-05-11 21:19:09 +00:00
Aurimas Liutikas
c61fdfd2d1 Merge "Fix incompatibilities with Kotlin 1.5.0" am: 600dcaf908 am: 70ba49b0e5 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1697314

Change-Id: I5ba357b8fe77930d2602c436bafbcde841624fa0
 2021-05-11 21:19:00 +00:00
TreeHugger Robot
378fafcd3b Merge "Hide icons in QS Header if there's a cutout" into sc-dev 2021-05-11 21:17:38 +00:00
TreeHugger Robot
50368e6a46 Merge "Add more logging for power menu lite" into sc-dev 2021-05-11 21:16:36 +00:00
Anthony Hugh
54d4f30605 Merge "Use correct UserId when checking for lock state" into sc-dev 2021-05-11 21:16:19 +00:00
TreeHugger Robot
30f6ef3a7b Merge "Fix segmentation fault in aapt2" into sc-dev 2021-05-11 21:05:42 +00:00
TreeHugger Robot
cc3c259e52 Merge "Fix NPE when NotificationEntry can't be found for action tap" into sc-dev 2021-05-11 20:53:41 +00:00
TreeHugger Robot
65ea7496c2 Merge "Fix accessibility string" into sc-dev 2021-05-11 20:52:59 +00:00
TreeHugger Robot
87219c639d Merge "Set the mCarrierConfigTracker before using it" into sc-dev 2021-05-11 20:52:53 +00:00
TreeHugger Robot
2c8a58ff96 Merge "Refactor animations in QSTileViewImpl" into sc-dev 2021-05-11 20:46:17 +00:00
TreeHugger Robot
2e1f03a6c7 Merge "Support VCN network in the default network tracker" into sc-dev 2021-05-11 20:41:31 +00:00
Jay Aliomer
c225754e1a Merge "Sample at least 1 pixel from image wallpaper" into sc-dev 2021-05-11 20:34:46 +00:00
Hui Wang
1b8695828d Merge "Update the format of RCS provisioning config XML" am: fb0990fa0a 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1695125

Change-Id: I0cd8276825bc23baa0e3a2d4eaf2f2db55f679c2
 2021-05-11 20:34:27 +00:00
TreeHugger Robot
a1f1ba172b Merge "Add <staging-public-group-final> to aapt2 (2/2)" into sc-dev 2021-05-11 20:27:56 +00:00
TreeHugger Robot
67976c83e2 Merge "Set temp allowlist for runtime broadcast." into sc-dev 2021-05-11 20:27:43 +00:00
Aurimas Liutikas
70ba49b0e5 Merge "Fix incompatibilities with Kotlin 1.5.0" am: 600dcaf908 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1697314

Change-Id: I32032ee50ee243f404b43fa304419c83f5ce0960
 2021-05-11 20:25:59 +00:00
TreeHugger Robot
17d7515610 Merge "Fix flaky tests in PeopleSpaceWidgetManager" into sc-dev 2021-05-11 20:24:31 +00:00
Hui Wang
fb0990fa0a Merge "Update the format of RCS provisioning config XML" 2021-05-11 20:18:26 +00:00
Chloris Kuo
d74e0b8f19 Merge "Fix bug: NAS set to none will be reset to default after the second reboot" into sc-dev 2021-05-11 20:14:44 +00:00
Aurimas Liutikas
600dcaf908 Merge "Fix incompatibilities with Kotlin 1.5.0" 2021-05-11 20:12:09 +00:00
Treehugger Robot
a826482f39 Merge "HDMICEC: Add setarc shell command" am: 565f3fe51c am: 4f7105a12b am: 585a63abbe 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1572280

Change-Id: I053a618940d426b89151165ab1a4f17432551ec9
 2021-05-11 20:04:56 +00:00
Michael Wachenschwanz
7d8d752737 Merge "Wipe BatteryStats on Custom Power Bucket change" into sc-dev 2021-05-11 20:02:25 +00:00
Treehugger Robot
585a63abbe Merge "HDMICEC: Add setarc shell command" am: 565f3fe51c am: 4f7105a12b 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1572280

Change-Id: I72899e5599703861cb672eae6e1db3959d2d7351
 2021-05-11 19:46:44 +00:00
TreeHugger Robot
dd3707adc0 Merge "Camera: Support advanced extensions" into sc-dev 2021-05-11 19:42:46 +00:00
Alexander Dorokhine
ffa64b6009 Update framework from jetpack. 
Changes included:
* 25ca4ff: Sync AppSearch with google3 update ag/14473436 (f13a174)
* a1ad7b4: Make GenericDocument#toString print results in a deterministic order.
* bf3051b: Sync AppSearchResult and AppSearchBatchResult to framework.
* dd3c05f: Add more call types
* fb27537: Add API coverage for SearchSpec.getProjections

Bug: 185445694
Bug: 187424629
Bug: 146218515
Bug: 173532925
Bug: 183239965
Test: Presubmit
Change-Id: I5392a10fe03451a895136cdbc75d5bf0df081aa3
 2021-05-11 12:42:17 -07:00
Jieru Shi
ef2e5dd22b Add SMARTSPACE_CARD_RENDERED for media card 
Test: will apend statsd_drive logs
Bug:181364757

Change-Id: I6e9a38d631d146195d3f8a898e655dcffc847856
 2021-05-11 12:29:25 -07:00
TreeHugger Robot
e13111babd Merge "Update usage of FontCollection interfaces." into sc-dev 2021-05-11 19:27:35 +00:00
TreeHugger Robot
de9e6190bf Merge "Remove last learned battery capacity from battery checkin dump" into sc-dev 2021-05-11 19:22:53 +00:00
TreeHugger Robot
f985ef80db Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev 2021-05-11 19:13:22 +00:00
TreeHugger Robot
ab367ab510 Merge "AttachedSurfaceControl: Respond to API feedback." into sc-dev 2021-05-11 19:13:05 +00:00
Treehugger Robot
4f7105a12b Merge "HDMICEC: Add setarc shell command" am: 565f3fe51c 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1572280

Change-Id: I26a2cdf41f8e4c705c1b27f77e596c4e789494ce
 2021-05-11 18:58:26 +00:00
Jeff DeCew
e89c3de2d8 Fix NPE when NotificationEntry can't be found for action tap 
Fixes: 187840537
Test: tap some actions
Change-Id: Ie9282295415821bff0fe3bb7cd0b96ef0fe184b8
 2021-05-11 14:21:44 -04:00
Vova Sharaienko
3a8ea8727d [automerger skipped] Merge changes from topic "lmkd_ams" am: 360eb85898 am: d156fe95a2 am: 088d5b61d7 -s ours 
am skip reason: Merged-In I9b65d82618654d59236c79be8cd8da66bc90c91c with SHA-1 42cda4953c is already in history

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1702074

Change-Id: I02298cc2b0adaf733b72f9472a318572c017b8af
 2021-05-11 18:14:30 +00:00
Vova Sharaienko
6d21e6758f [automerger skipped] ActivityManagerService: reroute lmkd atoms logging am: 48f93dabe0 am: 330d8a7cf9 am: 488f8197a2 -s ours 
am skip reason: Merged-In I69ef1a9daa5532244a15665bff06d0ad6b370869 with SHA-1 26df817b7c is already in history

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1702073

Change-Id: I1d0307fcd32c1b9966106835cdbea669d0027261
 2021-05-11 18:14:20 +00:00
Fabian Kozynski
f1f142ec2a Hide icons in QS Header if there's a cutout 
If there's a cutout, put a blocking view in the space of the cutout.
Also, make the views on each side to be 0dp, weight 1. That way, the
view remains centered.

Fixes: 187145236
Test: manual
Change-Id: Ide54995afba92fbc559fdbe4c77bf5ca495b7b57
 2021-05-11 14:14:05 -04:00
Treehugger Robot
b291cbbf8b [automerger skipped] Merge "Revert "Use TelephonyManager#isEmergencyNumber() instead"" am: 9955752655 am: f50a479c87 am: 3dc09e761d -s ours 
am skip reason: Merged-In I5df03a61f55f863e17594aa3239433a5048a4890 with SHA-1 839508eea2 is already in history

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1702033

Change-Id: I1ec154cfd52ced4e14236081ae245045723f89fc
 2021-05-11 18:13:28 +00:00
Benedict Wong
ed4b96cf10 Merge "Add clarifying comments on for IPsec forward policies" am: 1a88665f3c am: 2a42aa8921 am: 1d5e155997 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1702525

Change-Id: I77e806ab3e76307dfc6456b210f691027aaeec66
 2021-05-11 18:13:01 +00:00
Treehugger Robot
565f3fe51c Merge "HDMICEC: Add setarc shell command" 2021-05-11 18:09:17 +00:00
Fabian Kozynski
5217ea9b6b Fix accessibility string 
Test: build
Bug: 187530100
Change-Id: I6b2bd8f99a719114b57a43e9f06432ba7e5167f8
 2021-05-11 18:06:12 +00:00
Chloris Kuo
f6a6597f24 Fix bug: NAS set to none will be reset to default after the second 
reboot

Bug: 185725135
Test: atest NotificationAssistantsTest, ManagedServicesTest,
NotificationManagedServiceTest

Change-Id: I63ba2a4e6fc1e9ac4612231af25c55fb66b0991e
 2021-05-11 11:04:42 -07:00
Vova Sharaienko
088d5b61d7 Merge changes from topic "lmkd_ams" am: 360eb85898 am: d156fe95a2 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1702074

Change-Id: Id59cd0b04f118ee7064107487753e7a0c21dd436
 2021-05-11 18:04:12 +00:00
Vova Sharaienko
488f8197a2 ActivityManagerService: reroute lmkd atoms logging am: 48f93dabe0 am: 330d8a7cf9 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1702073

Change-Id: I9134590521ba3238a7bb03043301f534c4fef560
 2021-05-11 18:04:07 +00:00
Alexander Dorokhine
48df6c6055 Merge "Unhide the storage attribution API with system visibility." into sc-dev 2021-05-11 18:00:42 +00:00
Vova Sharaienko
d156fe95a2 Merge changes from topic "lmkd_ams" am: 360eb85898 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1702074

Change-Id: I83c23ee6717baf465048891f086cfc9f5c516634
 2021-05-11 17:52:28 +00:00