summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2020-12-09Remove accidentally added diff filetemp_rvc_qpr_mergeAgatha Man
Bug: 169889379 Test: presubmit Change-Id: Ib81ba3288a986546bc570c3759c55d026add591a
2020-12-10Merge "[Mainline Migration] Migrate NetworkUtils" am: a086c295e7Serik Beketayev
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1498168 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: Icc0a49e76f87a741f4410b53e9a40012e37fde36
2020-12-09Merge "[Mainline Migration] Migrate NetworkUtils"Serik Beketayev
2020-12-09Merge "Migrate apex/statsd -> packages/modules/StatsD/apex" into ↵Baligh Uddin
stage-aosp-master
2020-12-09Merge "Added OWNERS for data/etc/car" am: cabc628f66Felipe Leme
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1521011 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: Ie0e337d54e9dcd9cac669656c501dde3d6185e3b
2020-12-09Merge "Added OWNERS for data/etc/car"Felipe Leme
2020-12-09Added OWNERS for data/etc/carFelipe Leme
Test: none Bug: 170333009 Exempt-From-Owner-Approval: automotive-specific directory Change-Id: I92cd4ca6bab38b5297f77356ee1f035d412d3a3c
2020-12-09Merge "Add mobi extensions to known mime types" am: 806aa0b377Jeff Sharkey
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1514851 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I726c027d51fb6b6c303ed7e6995197307e186bb0
2020-12-09Merge "Add mobi extensions to known mime types"Jeff Sharkey
2020-12-09Add mobi extensions to known mime typesSai Rijal
Allow .prc/.mobi file extensions to be read as a separate mobi mime type. This allows Android to open mobi files with the correct mime type. This in turn allows applications to set their intent filters based on mime type when opening mobi files. Test: CtsMimeMapTestCases Change-Id: I2b8f80f019f930f888e8e50db8b4efee0f0d4035
2020-12-09Merge "Add OWNERS to HDMI control directories" am: fd2f7c893aJeff Sharkey
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1519668 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I8d8dd902baec65abec93557d00a22ad3fcd66347
2020-12-09Merge "Add OWNERS to HDMI control directories"Jeff Sharkey
2020-12-09Add OWNERS to HDMI control directoriesMarvin Ramin
Test: n/a Change-Id: I8e77822bb0a87c8b397be28d60528a35b0eda7b2
2020-12-09Merge "Add per-file OWNERS for BatteryStats" am: cac4499628Dmitri Plotnikov
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1520758 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I5d258d326af6662a7e8d1dcaa1bbbeffdc19da94
2020-12-09Merge "Add per-file OWNERS for BatteryStats"Dmitri Plotnikov
2020-12-09Merge changes from topic "install-hints" am: 21b065b610Christian Wailes
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1482838 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I0d9a22925b9ea70f06954e57f7ce98a5c3cfd3b1
2020-12-09Adds an "install scenario" field to the appropriate datastructures am: ↵Chris Wailes
d42204a865 Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1465553 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: Ifeb0c921ec079202dba5b0b50eb147b09ea3042e
2020-12-08Add per-file OWNERS for BatteryStatsDmitri Plotnikov
Test: N/A Change-Id: Ie9eef7eed7f097113074c3c5f3f7a7084a55f97b
2020-12-09Merge changes from topic "install-hints"Christian Wailes
* changes: Modify dexopt invocation based on install scenario Adds an "install scenario" field to the appropriate datastructures
2020-12-08Merge "OWNERS file update for UserManagerInternal" am: 3a7861281bAdam Bookatz
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1519214 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: Id316389aa3d71182fbcd15e76322beadbd30048f
2020-12-08Merge "OWNERS file update for UserManagerInternal"Adam Bookatz
2020-12-08Merge changes from topic "dec5" am: c2793cf12bJeff Sharkey
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1519384 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: Ifdc390f5ae046c515a30158f3f55b831be147547
2020-12-08Improve OWNERS coverage across frameworks/base/. am: fab0ab3c9cJeff Sharkey
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1519383 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I0211462ecbcd9ad66f66af87e31cf12e1582fc65
2020-12-08Improve OWNERS coverage across frameworks/base/. am: 061c2ec3b6Jeff Sharkey
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1519382 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I1218107820d89a570b55768ed6f9b223cd0db5fc
2020-12-08Merge changes from topic "dec5"Jeff Sharkey
* changes: Improve OWNERS coverage across frameworks/base/. Improve OWNERS coverage across frameworks/base/. Improve OWNERS coverage across frameworks/base/.
2020-12-08Improve OWNERS coverage across frameworks/base/.Jeff Sharkey
As general background, OWNERS files expedite code reviews by helping code authors quickly find relevant reviewers, and they also ensure that stakeholders are involved in code changes in their areas. Some teams under frameworks/base/ have been using OWNERS files successfully for many years, and we're ready to expand them to cover more areas. Here's the historical coverage statistics for the last two years of changes before these new OWNERS changes land: -- 56% of changes are fully covered by OWNERS -- 17% of changes are partially covered by OWNERS -- 25% of changes have no OWNERS coverage Working closely with team leads, we've now identified clear OWNERS on a per-package basis, and we're using "include" directives whenever possible to to simplify future maintenance. With this extensive effort, we've now improved our coverage as follows: -- 98% of changes are fully covered by OWNERS -- 1% of changes are partially covered by OWNERS -- 1% of changes have no OWNERS coverage This specific change is automatically generated by a script that identifies relevant "include" directives. Bug: 174932174 Test: manual Exempt-From-Owner-Approval: refactoring with team leads buy-in Merged-In: I3480ddf2fe7ba3dfb922b459d4da01fa17a2c813 Change-Id: I3480ddf2fe7ba3dfb922b459d4da01fa17a2c813
2020-12-08Improve OWNERS coverage across frameworks/base/.Jeff Sharkey
As general background, OWNERS files expedite code reviews by helping code authors quickly find relevant reviewers, and they also ensure that stakeholders are involved in code changes in their areas. Some teams under frameworks/base/ have been using OWNERS files successfully for many years, and we're ready to expand them to cover more areas. Here's the historical coverage statistics for the last two years of changes before these new OWNERS changes land: -- 56% of changes are fully covered by OWNERS -- 17% of changes are partially covered by OWNERS -- 25% of changes have no OWNERS coverage Working closely with team leads, we've now identified clear OWNERS on a per-package basis, and we're using "include" directives whenever possible to to simplify future maintenance. With this extensive effort, we've now improved our coverage as follows: -- 98% of changes are fully covered by OWNERS -- 1% of changes are partially covered by OWNERS -- 1% of changes have no OWNERS coverage This specific change is automatically generated by a script from detailed ownership information confirmed by team leads. Bug: 174932174 Test: manual Exempt-From-Owner-Approval: refactoring with team leads buy-in Merged-In: I9789c97c1de8e5d962b48c29c57d82fe83729eba Change-Id: I9789c97c1de8e5d962b48c29c57d82fe83729eba
2020-12-08Improve OWNERS coverage across frameworks/base/.Jeff Sharkey
As general background, OWNERS files expedite code reviews by helping code authors quickly find relevant reviewers, and they also ensure that stakeholders are involved in code changes in their areas. Some teams under frameworks/base/ have been using OWNERS files successfully for many years, and we're ready to expand them to cover more areas. Here's the historical coverage statistics for the last two years of changes before these new OWNERS changes land: -- 56% of changes are fully covered by OWNERS -- 17% of changes are partially covered by OWNERS -- 25% of changes have no OWNERS coverage Working closely with team leads, we've now identified clear OWNERS on a per-package basis, and we're using "include" directives whenever possible to to simplify future maintenance. With this extensive effort, we've now improved our coverage as follows: -- 98% of changes are fully covered by OWNERS -- 1% of changes are partially covered by OWNERS -- 1% of changes have no OWNERS coverage This specific change begins defining top-level OWNERS lists, including a general catch-all for string translations. Bug: 174932174 Test: manual Exempt-From-Owner-Approval: refactoring with team leads buy-in Change-Id: Ie7ac3302d40a717fa048115cca2ea4359de64959
2020-12-08[automerger skipped] Merge "Migrate apex/statsd -> ↵Treehugger Robot
packages/modules/StatsD/apex" am: a021ce9c2f -s ours am skip reason: Change-Id Ifee35a00de64e194abb80af5d85e34732244f509 with SHA-1 a73e594013 is in history Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1518642 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I06b1f93fb18719b6e9c7040f115b877d664b207c
2020-12-08Merge "Migrate apex/statsd -> packages/modules/StatsD/apex"Treehugger Robot
2020-12-08Merge "Persist screen brightness setting through upgrade" am: 2a747f002fFiona Campbell
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1517740 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I75a7feb9ec86baf2a588c1187ec2632be64beaf0
2020-12-08Merge "Persist screen brightness setting through upgrade"Fiona Campbell
2020-12-08Merge "Test for the current behaviour of updating a network's owner UID." ↵Lorenzo Colitti
am: e581224c6a Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1512690 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I35a50be2f748177cde9400449386465d77a21556
2020-12-08Merge "Test for the current behaviour of updating a network's owner UID."Lorenzo Colitti
2020-12-07Modify dexopt invocation based on install scenarioChris Wailes
This CL implements the logic that modifies the way dexopt is invoked based on the provided installation scenario. Bug: 173137187 Test: build Merged-In: Iab34d79cbbc4fb0d88946ef38a1edcca16cd3a29 Change-Id: Iab34d79cbbc4fb0d88946ef38a1edcca16cd3a29
2020-12-07Adds an "install scenario" field to the appropriate datastructuresChris Wailes
This CL adds an "install scenario" field to several data structures used by the Package Manager. This value will be used by a following CL to adjust the invocation of dexopt based on the indicated use case. Bug: 173137187 Test: build Merged-In: I1d0df8edf85a598905a5e7509f6c811df5c20e2e Change-Id: I1d0df8edf85a598905a5e7509f6c811df5c20e2e
2020-12-07Merge "Update BackgroundDexOptServiceIntegrationTests" am: f3e5403f71Treehugger Robot
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1518643 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: Id8cd8320c32b84557031d19aceefb8f7fca1db45
2020-12-07Merge "Update BackgroundDexOptServiceIntegrationTests"Treehugger Robot
2020-12-07Merge "Define EXTRA_CODE_CALL_RETRY_EMERGENCY for emergency CS retry" am: ↵Brad Ebinger
cf38228e0d Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1264905 Change-Id: Ie403a16adf294c423d62703ae65c7bbd0e394e83
2020-12-07Merge "Use phoneAccountHandle based on connection" am: eb87a5267fBrad Ebinger
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1428408 Change-Id: Ia95430a2965e8647faa3ce19d04ae55be7e2769e
2020-12-07Merge "Define EXTRA_CODE_CALL_RETRY_EMERGENCY for emergency CS retry"Brad Ebinger
2020-12-07Update BackgroundDexOptServiceIntegrationTestsChris Wailes
This CL updates BackgroundDexOptServiceIntegrationTests to take into account changes in compiler filters. Specifically, quicken is being deprecated and had to be replaced in the test. Test: adb BackgroundDexOptServiceIntegrationTests Merged-In: I3d4f96e27586cbf647d301a4ee7afd32576bbf41 Change-Id: I3d4f96e27586cbf647d301a4ee7afd32576bbf41
2020-12-07OWNERS file update for UserManagerInternalAdam Bookatz
Change-Id: I40498a29c0832762a51de7daff2403b3470c73ac Test: N/A
2020-12-07Merge "Adding AudioUsage converters to AudioAttributes" am: 87b5c6a2a1Treehugger Robot
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1518202 Change-Id: I6e84fcacbc45e667f592ef247ea1e87d9ae8e248
2020-12-07Merge "Use phoneAccountHandle based on connection"Brad Ebinger
2020-12-07Merge "Adding AudioUsage converters to AudioAttributes"Treehugger Robot
2020-12-07Merge "Add comments to the process*FromAgent methods." am: c779768dbcLorenzo Colitti
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1519518 Change-Id: Ia90b3ae008561b2ec3723770802815b46937022e
2020-12-07Merge "Allow shell to invoke music recognition api" am: a7d6351972Nick Moukhine
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1517737 Change-Id: I8fa1047275ca29d5386dfc28491da84f531bd86f
2020-12-07Merge "Add comments to the process*FromAgent methods."Lorenzo Colitti
2020-12-08Test for the current behaviour of updating a network's owner UID.Lorenzo Colitti
The current behaviour is at least bizarre and arguably incorrect. Add a test to document the current behaviour so we can check that any changes we make to this behaviour are correct. Test: test-only change Change-Id: I345bd320eced96316d92e520f576ae06b8020d9f