Anton Hansson
24b4d166dd
Merge "Remove @TestApi from @SystemApi symbols" am: d2d4637685 am: cbe282347e am: 14897c256d
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1466264
Change-Id: I859503688ea3254d5bd1b55e80cf1962286e948f
2020-10-20 20:31:58 +00:00
Chiachang Wang
8a60923e76
Merge "Remove unused MockableSystemProperties from DnsManager constructor" am: 3e23d7271b am: 250a9d3d20 am: 04dede7600
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1466231
Change-Id: I88c08a92dafdcb4d40374068d6f9466f5b57c819
2020-10-20 20:31:23 +00:00
Yegor Malyshev
660268ab4b
Merge "Support animation parts fading out" am: 21819ef3b6 am: 648a4c2ea4 am: 858986161e
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1466262
Change-Id: I12887abcae65f27d5a8c8b19acbbf63ea4833ff0
2020-10-20 20:31:09 +00:00
Jing Ji
68778ba87d
Make a copy of WorkSources before noting the battery stats
...
The battery stats are noted asynced, the work sources could be
mutated before they are actualy recorded into battery stats.
So make a copy of them prior to the noting.
Bug: 169573447
Test: atest FrameworksCoreTests:BatteryStatsTests
Test: atest CtsIncidentHostTestCases
Test: atest BatteryStatsDumpsysTest
Change-Id: I6326f7d66f9590ce544fc491fda07cd4397ef804
2020-10-20 13:30:28 -07:00
Yi Kong
4bd5549302
Merge "profcollectd: OTA Observer" am: 14a7d344a4 am: ebd04e98ee am: 6f99c0e76a
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1466225
Change-Id: Id60a7bd5eadb307843a6948296a6c32c6dd44def
2020-10-20 20:30:21 +00:00
Aaron Huang
f7ebb0c0e4
Merge "Create service-connectivity.jar" am: bfceacea50 am: b91257f553 am: 5b03885d43
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1351252
Change-Id: I9a04f911043e34c3de1bcac3647773c5adfde294
2020-10-20 20:27:13 +00:00
TreeHugger Robot
24b71afb2f
Merge "Inject more dependencies in PackageManagerService"
2020-10-20 20:25:59 +00:00
Treehugger Robot
95b3fe3a3e
Merge changes Ie238e8e5,I113e33a7 am: 5dbc2cd15d am: e349439f69 am: ea6304aa95
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1455079
Change-Id: I5368c548efd49ac13b3cc4794a989fe3cfc88a22
2020-10-20 20:25:34 +00:00
Treehugger Robot
f39592fb81
[automerger skipped] Merge "Merge redfin/bramble support." am: b0c41a1b0c -s ours am: 4fbdfd3231 -s ours am: a41aeca464 -s ours
...
am skip reason: Change-Id I25b60e5225247a335cdc0dcd751de47374cdcfbb with SHA-1 35a2a4c3fd is in history
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1466483
Change-Id: I4101ec400a42928c76ad8de32be4723976316763
2020-10-20 20:18:25 +00:00
Liz Kammer
f5759da7a2
Merge "Do not change resources table for overriding apps" into mainline-prod
2020-10-20 20:12:22 +00:00
TreeHugger Robot
a6065e99a7
Merge "Improve QUALITY_* constant documentation"
2020-10-20 20:09:48 +00:00
TreeHugger Robot
40c465dc24
Merge "Improvements on SystemServiceManager:"
2020-10-20 20:04:43 +00:00
Treehugger Robot
5b25b120c5
Merge "Add initial unit tests for HdmiCecMessageValidator" am: 95d5d13bb5 am: 005dec645b
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1452497
Change-Id: I25d56a53ea851b135866636588707420009e7c4f
2020-10-20 19:45:13 +00:00
Anton Hansson
14897c256d
Merge "Remove @TestApi from @SystemApi symbols" am: d2d4637685 am: cbe282347e
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1466264
Change-Id: I86daec690141893837ec58ab1d75aecc88557ff9
2020-10-20 19:45:04 +00:00
Chiachang Wang
04dede7600
Merge "Remove unused MockableSystemProperties from DnsManager constructor" am: 3e23d7271b am: 250a9d3d20
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1466231
Change-Id: Ib8464068df47baebd3d56c66f6b517d8f59da4f9
2020-10-20 19:44:46 +00:00
Yegor Malyshev
858986161e
Merge "Support animation parts fading out" am: 21819ef3b6 am: 648a4c2ea4
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1466262
Change-Id: Ib412241c1a1c9c6f8310eb6418befdbc54e77ff2
2020-10-20 19:44:31 +00:00
Yi Kong
6f99c0e76a
Merge "profcollectd: OTA Observer" am: 14a7d344a4 am: ebd04e98ee
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1466225
Change-Id: I2b7cda7d3d7fe133bb4af6585fb4afca3b0fbaa3
2020-10-20 19:44:09 +00:00
Aaron Huang
5b03885d43
Merge "Create service-connectivity.jar" am: bfceacea50 am: b91257f553
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1351252
Change-Id: Ic068be012bee6d8b1cd7b974896da9750e6ca453
2020-10-20 19:42:46 +00:00
TreeHugger Robot
5e42bc3505
Merge "PendingIntent for permission slice should be immutable."
2020-10-20 19:42:43 +00:00
Treehugger Robot
ea6304aa95
Merge changes Ie238e8e5,I113e33a7 am: 5dbc2cd15d am: e349439f69
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1455079
Change-Id: Ib439f540397986135192962d771c3f753a7f759c
2020-10-20 19:42:19 +00:00
Treehugger Robot
005dec645b
Merge "Add initial unit tests for HdmiCecMessageValidator" am: 95d5d13bb5
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1452497
Change-Id: Ifdbd58ea10c35a84f4bb2c551d5ee1db460cacf1
2020-10-20 19:36:18 +00:00
Wale Ogunwale
093aba3d8a
Have createRootTask return TaskAppearInfo
...
We return TaskAppearInfo on TaskOrganizer#createRootTask so it doesn't
have to wait for taskAppeared signal to take action.
Also, added createRootTask(..., listener) method to ShellTaskOrganizer
so that a specific listener can be associated with a root task we are
creating.
Bug: 169266958
Test: split-screen works.
Change-Id: I5948e623481deadb0aa5fc99b9941914f44a68e2
2020-10-20 12:36:03 -07:00
Treehugger Robot
a41aeca464
[automerger skipped] Merge "Merge redfin/bramble support." am: b0c41a1b0c -s ours am: 4fbdfd3231 -s ours
...
am skip reason: Change-Id I25b60e5225247a335cdc0dcd751de47374cdcfbb with SHA-1 35a2a4c3fd is in history
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1466483
Change-Id: I5c87f514ba14109b8a79e12adee2115a87cb792b
2020-10-20 19:34:06 +00:00
Anton Hansson
cbe282347e
Merge "Remove @TestApi from @SystemApi symbols" am: d2d4637685
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1466264
Change-Id: Ieee671c4fb41f05bd5c4475cf187d8797dea7e67
2020-10-20 19:33:57 +00:00
Chiachang Wang
250a9d3d20
Merge "Remove unused MockableSystemProperties from DnsManager constructor" am: 3e23d7271b
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1466231
Change-Id: I5ff54146e11ac47e0ccc449eda3ea2a081caae6d
2020-10-20 19:31:48 +00:00
Yegor Malyshev
648a4c2ea4
Merge "Support animation parts fading out" am: 21819ef3b6
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1466262
Change-Id: I4aa75b0c3888fa9cfbfc7434e65f27c7f4c46469
2020-10-20 19:27:47 +00:00
Yi Kong
ebd04e98ee
Merge "profcollectd: OTA Observer" am: 14a7d344a4
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1466225
Change-Id: If4daf34734dea92f027c80314a4f222d2e24b8ee
2020-10-20 19:22:59 +00:00
Kevin Chyn
247408b28f
Add missing parameters to notifyAcquired and notifyError
...
Adds missing acquireInfo and errorCode parameters
Bug: 169459906
Test: make -j update-api && make -j
Change-Id: I8cae7662e9d4ad7dad6064365479d0e08b7e4d11
2020-10-20 12:21:33 -07:00
Aaron Huang
b91257f553
Merge "Create service-connectivity.jar" am: bfceacea50
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1351252
Change-Id: Id9b4d44189ad73760ce4c50b7c5b53a94e26fc84
2020-10-20 19:19:41 +00:00
Jeff Sharkey
b2bbdaa42f
Fixed CursorWindow signed math for x86 builds.
...
All tests for our recent CursorWindow changes have been passing for
ARM 64-bit builds, but they weren't executed against 32-bit x86
builds until after merged.
It's not actually safe to use the "off_t" type, so we need to cast
to "int32_t" when doing checks against possible-negative values,
such as in allocRow().
We also add tests that verify negative rows/columns are identified
as invalid positions, which requires that we check the resulting
pointer against both mSlotsEnd and mSlotsStart.
Bug: 169251528, 171276404, 171275409
Test: atest libandroidfw_tests:CursorWindowTest
Test: atest CtsDatabaseTestCases
Change-Id: Iea5f7546850f691e183fbb6e6d0952cd02b00d0f
2020-10-20 13:19:06 -06:00
Treehugger Robot
e349439f69
Merge changes Ie238e8e5,I113e33a7 am: 5dbc2cd15d
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1455079
Change-Id: Ic38d22e1a8ec41fb611e8dc01f500d804730770a
2020-10-20 19:11:34 +00:00
Treehugger Robot
4fbdfd3231
[automerger skipped] Merge "Merge redfin/bramble support." am: b0c41a1b0c -s ours
...
am skip reason: Change-Id I25b60e5225247a335cdc0dcd751de47374cdcfbb with SHA-1 35a2a4c3fd is in history
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1466483
Change-Id: Idee4f40cddc7bdf72134438ab3fd30f3754bffea
2020-10-20 19:04:02 +00:00
Mark Renouf
b5fbf03d10
Use WindowContext in GlobalScreenshot
...
Provides a visual context, display-specific config
and defines a known windowToken for use with scroll
capture.
Test: manually trigger system screenshot
Change-Id: Icb543f07328741065293f31571c1fbe4c229147c
2020-10-20 14:47:57 -04:00
Sally
d4be6fdd46
make RBC string non-translatable
...
Translate when feature name is official
Test: n/a
Bug b/171246620
Change-Id: I30980b4a0158184fc819f78456b2fb38057746df
2020-10-20 18:47:19 +00:00
TreeHugger Robot
c7393c8ed0
Merge "Disable initializing wm component for non-primary sysui process"
2020-10-20 18:44:17 +00:00
Soonil Nagarkar
c73cecefc1
Improve QUALITY_* constant documentation
...
Given devs a better idea of how these quality constant may work.
Bug: 168624248
Test: n/a
Change-Id: I16910bc45d013b4a366d4e8036f63fdfbef55461
2020-10-20 11:36:22 -07:00
Dave Mankoff
7289d41876
5/N Rename QSFooterImpl to QSFooterView
...
Remove QSFooterImplController.Factory
Bug: 168904199
Test: atest SystemUITests && manual
Change-Id: Ie2ef5c620835c7ebb104316c0004e888af1c34cf
2020-10-20 14:31:42 -04:00
Dave Mankoff
a61f381ca9
4/N Remove ActivityStarter from QSFooterImpl.
...
This removes the last dependency injection into the QSFooterImpl view.
Bug: 168904199
Test: manual && atest SystemUITests
Change-Id: I1b6d811d2d21d1df99687671ad3bc6331ce3eef3
2020-10-20 14:31:42 -04:00
Dave Mankoff
2a89fa3359
3/N Remove DevProvCtrl & UserTracker from QSFooter
...
Remove DeviceProvisionedConroller and UserTracker from QSFooterImpl. This also adds
QSFooterImplControllerTest, and fixes one of the tests that was marked as failing.
Bug: 168904199
Test: manual
Change-Id: I0e04bef8df76c6b73c8844f4679cfef08b3b2c13
2020-10-20 14:31:42 -04:00
Dave Mankoff
ffbae7f39a
2/N Move UserInfoController out of QSFooterImpl
...
Bug: 168904199
Test: manual && atest SystemUITests
Change-Id: I2e409ec2fad4b9167a1900571dc30eff01affde5
2020-10-20 14:31:42 -04:00
Dave Mankoff
6863447c62
1/N Add Controller for QSFooter
...
Not much too this CL. It adds QSFooterImplController, has it
implementing QSFooter, and then uses the controller anywhere the
view was being used before.
Bug: 168904199
Test: manual
Change-Id: Ie1d5125c8cd706e325a40f4b60a52bab1dd3d213
2020-10-20 14:31:41 -04:00
Anton Hansson
a9ced809ad
Dist the merged api txts for normal builds too
...
Makes the merged txts available on the build server for most
continuous builds.
Bug: 169034951
Bug: 170802619
Test: m dist && diff frameworks/base/api and out/dist/api
Change-Id: I57daa8e42c3931070f19cde9a74d2b11d03d2d6d
2020-10-20 19:26:18 +01:00
Amy Zhang
fccbf2738c
Merge changes from topic "streamtype"
...
* changes:
Configure avStreamType in Tuner JNI
Add Audio/Video Stream Type setter in Tuner Framework
2020-10-20 18:18:49 +00:00
TreeHugger Robot
44fcf11175
Merge "Call DecorView.drawableChanged() in PhoneWindow.setBackgroungDrawable" into rvc-qpr-dev am: 7ce178e6cb am: bf26b5a9f4
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12685846
Change-Id: I6305948aea70c8283c2670caad61a1a6699b174c
2020-10-20 18:06:29 +00:00
TreeHugger Robot
bf26b5a9f4
Merge "Call DecorView.drawableChanged() in PhoneWindow.setBackgroungDrawable" into rvc-qpr-dev am: 7ce178e6cb
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12685846
Change-Id: I438591f2faa40c9ab80a8d774b48de7e7a1f9e1b
2020-10-20 17:44:47 +00:00
Pinyao Ting
606e6c440d
PendingIntent for permission slice should be immutable.
...
Bug: 170769497
Test: manual
Change-Id: I9cfea119ae77327d56fda5513fc30d994ea1e11e
2020-10-20 10:37:53 -07:00
Jorge Gil
5fbbee8e29
Merge "Use updated source rect hint in PIP exit animation"
2020-10-20 17:30:45 +00:00
TreeHugger Robot
7ce178e6cb
Merge "Call DecorView.drawableChanged() in PhoneWindow.setBackgroungDrawable" into rvc-qpr-dev
2020-10-20 17:24:35 +00:00
Jordan Jozwiak
2a4b6d8024
Merge "Move constants from service to manager"
2020-10-20 17:21:24 +00:00
TreeHugger Robot
d44087303d
Merge "Tuner JNI to use V1_1 ScanCallback"
2020-10-20 17:13:55 +00:00