Dave Mankoff
cbe7ed65bd
Merge "Remove BatteryController reference from ReverseChargingController"
2021-01-06 14:41:11 +00:00
Beverly Tai
99e9f0dc5c
Merge "Use app uids in DndRule proto pulled atom"
2021-01-06 14:11:35 +00:00
TreeHugger Robot
d880d06006
Merge "Add tappable elements insets types to WM Wrapper"
2021-01-06 13:55:54 +00:00
Treehugger Robot
9f09740627
Merge "Add WM owners to the OWNERS of the related core tests" am: b59598f790 am: 56dde88a69 am: 71b7dc627a
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1540910
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Ia75cd8d2866bc2107884c0789e82d12a1b2ad6dc
2021-01-06 13:29:51 +00:00
Treehugger Robot
71b7dc627a
Merge "Add WM owners to the OWNERS of the related core tests" am: b59598f790 am: 56dde88a69
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1540910
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I2b5ea5e38660cabfbb853fee49ca07a0d672a2ee
2021-01-06 13:05:20 +00:00
Treehugger Robot
56dde88a69
Merge "Add WM owners to the OWNERS of the related core tests" am: b59598f790
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1540910
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Id2dc466fb1e8eb6c8f43283980bcdc5b22a1af35
2021-01-06 12:50:15 +00:00
Riddle Hsu
47fcbd746c
Merge "Remove IActivityTaskManager#setTaskWindowingModeSplitScreenPrimary"
2021-01-06 12:46:08 +00:00
TreeHugger Robot
974f4c3149
Merge "Handle provider initialization failure"
2021-01-06 12:28:28 +00:00
Treehugger Robot
b59598f790
Merge "Add WM owners to the OWNERS of the related core tests"
2021-01-06 12:27:13 +00:00
TreeHugger Robot
bb7aeb012e
Merge "Perform null check before updating originating tokens"
2021-01-06 12:24:56 +00:00
Treehugger Robot
022bcda29f
Merge "Change log tag of DynamicSystemClient to match class name" am: 916dfddfd0 am: 198e4b4c4b am: b704222433
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1537885
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I218799056e3b1c85505a6201b9275234648bc07c
2021-01-06 11:51:05 +00:00
Rhed Jao
4a56cdb883
[automerger skipped] Merge changes I5e1802c5,I4542568f,I99a052d7,Iae89206d,Ie955266a am: 9ca3672319 am: 918cc97a12 am: 3adb225c8b -s ours
...
am skip reason: Change-Id I5e1802c5912f4414f1ad3b8bdaf7c7420332b9d6 with SHA-1 1893959cf1 is in history
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1532905
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I588b120be7204e0c91763f0e896633adef62c6bb
2021-01-06 11:50:40 +00:00
Rhed Jao
bd6acac047
[automerger skipped] Fixes an error handling in BugreportProgressService am: 39b6acbb55 am: 76ac95e9be am: abe52a0718 -s ours
...
am skip reason: Change-Id I4542568fd2d2ad1c75c7c3b223accca4995938a3 with SHA-1 8ba3c84cff is in history
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1532904
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I118049d63e1a72b6d62c1d037cca60b57cb8cc97
2021-01-06 11:50:30 +00:00
Rhed Jao
2ab8c4b0cf
[automerger skipped] Fixes BugreportReceiverTest failed am: e9a2038f8a am: dfa52cd654 am: f64837f147 -s ours
...
am skip reason: Change-Id I99a052d74b71d503a655a769064a74246da150e5 with SHA-1 bc1f3bff51 is in history
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1532903
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Iaacd50dcca4dd7aa7764b70925a18cd01bbbc62f
2021-01-06 11:50:21 +00:00
Rhed Jao
bc9dcc151b
[automerger skipped] Fix BugreportReceiverTest am: 2150ce56db am: 4059b750f7 am: bf05d69e16 -s ours
...
am skip reason: Change-Id Iae89206da1d08a10891503869bbbf1ce18d4e31f with SHA-1 45c7d94d7a is in history
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1532902
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Ibf258c548c437b5373113d5b6fdc1b09fac3f780
2021-01-06 11:50:05 +00:00
Rhed Jao
30282912fb
[automerger skipped] Do not buzzing for each progress of bugreport notification am: 52e7d23f53 am: 186d884b05 am: 013276f9aa -s ours
...
am skip reason: Change-Id Ie955266ad8a7a27a9dc74743e276b5e9c7a2d6fb with SHA-1 d8b3398edf is in history
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1532901
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I22a653c123dd872adee7876ba150d9b032342d95
2021-01-06 11:49:57 +00:00
Neil Fuller
03dc561d35
Merge "Add an OWNERS file for location tz detection code" am: 8bdd40d2e5 am: e4ce0c47a3 am: 6b9434f9b3
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1540127
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I0509ce3c73568cdf44c168843cdb47d23fb040c9
2021-01-06 11:48:56 +00:00
Rubin Xu
49dd77abf0
Merge "Allow KeyChain.bindAsUser() to be called on the main thread"
2021-01-06 11:30:30 +00:00
Treehugger Robot
b704222433
Merge "Change log tag of DynamicSystemClient to match class name" am: 916dfddfd0 am: 198e4b4c4b
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1537885
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I36612768f8f876e93c624ed59d7c92bed7ae8b2d
2021-01-06 11:24:01 +00:00
Rhed Jao
3adb225c8b
Merge changes I5e1802c5,I4542568f,I99a052d7,Iae89206d,Ie955266a am: 9ca3672319 am: 918cc97a12
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1532905
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Ic99132f50babb1d890f737dc3a54e5b381f3c890
2021-01-06 11:23:40 +00:00
Rhed Jao
abe52a0718
Fixes an error handling in BugreportProgressService am: 39b6acbb55 am: 76ac95e9be
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1532904
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: If008b5ebdd158b5e0d96ccffb802b4916e4ebcf8
2021-01-06 11:23:30 +00:00
Rhed Jao
f64837f147
Fixes BugreportReceiverTest failed am: e9a2038f8a am: dfa52cd654
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1532903
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I9c440c0fb7b6a92cf20349f30cad299bb3b71dcc
2021-01-06 11:23:26 +00:00
Rhed Jao
bf05d69e16
Fix BugreportReceiverTest am: 2150ce56db am: 4059b750f7
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1532902
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: If97c1b1c19c4287443acd2c50d05191b2c1a94a5
2021-01-06 11:23:22 +00:00
Rhed Jao
013276f9aa
Do not buzzing for each progress of bugreport notification am: 52e7d23f53 am: 186d884b05
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1532901
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I4bfc7ae9c68f16ba9daf8229c459be055ae86682
2021-01-06 11:23:20 +00:00
Neil Fuller
6b9434f9b3
Merge "Add an OWNERS file for location tz detection code" am: 8bdd40d2e5 am: e4ce0c47a3
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1540127
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Ia00f758c3df3444dabd16f693ff6c4f84d665453
2021-01-06 11:22:02 +00:00
Treehugger Robot
198e4b4c4b
Merge "Change log tag of DynamicSystemClient to match class name" am: 916dfddfd0
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1537885
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Id89897af726a891adba349012e86af45ce02bf75
2021-01-06 11:16:56 +00:00
Treehugger Robot
916dfddfd0
Merge "Change log tag of DynamicSystemClient to match class name"
2021-01-06 11:11:58 +00:00
Rhed Jao
918cc97a12
Merge changes I5e1802c5,I4542568f,I99a052d7,Iae89206d,Ie955266a am: 9ca3672319
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1532905
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I151bb11d0b36dae2ac6d67c9a57e1619543bd136
2021-01-06 11:11:40 +00:00
Rhed Jao
76ac95e9be
Fixes an error handling in BugreportProgressService am: 39b6acbb55
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1532904
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I51ae9156cbb4148ce1b1c97e8d06fa23a4bccf8f
2021-01-06 11:09:10 +00:00
Rhed Jao
dfa52cd654
Fixes BugreportReceiverTest failed am: e9a2038f8a
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1532903
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I9a9a0fefa6e02271ee18e339c7c54e5e04573f6a
2021-01-06 11:05:39 +00:00
Rhed Jao
4059b750f7
Fix BugreportReceiverTest am: 2150ce56db
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1532902
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I75b3e243ac9219b01e6a0e00a9e35dc3ec852cb6
2021-01-06 11:00:41 +00:00
Rhed Jao
186d884b05
Do not buzzing for each progress of bugreport notification am: 52e7d23f53
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1532901
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I30dcb9cf48e0a1a2d37c85a313a749c82250d922
2021-01-06 10:55:11 +00:00
Neil Fuller
e4ce0c47a3
Merge "Add an OWNERS file for location tz detection code" am: 8bdd40d2e5
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1540127
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I3e46f18581b5674447aeecdae0bbfd7be7071830
2021-01-06 10:48:17 +00:00
Rhed Jao
9ca3672319
Merge changes I5e1802c5,I4542568f,I99a052d7,Iae89206d,Ie955266a
...
* changes:
Returns immediately if the bugreport file already exists
Fixes an error handling in BugreportProgressService
Fixes BugreportReceiverTest failed
Fix BugreportReceiverTest
Do not buzzing for each progress of bugreport notification
2021-01-06 10:41:13 +00:00
Neil Fuller
8df5ad8006
Merge "Delete location.timezone.provider API classes"
2021-01-06 10:32:18 +00:00
Benjamin Franz
f8983589ac
Merge "Per-app configuration for force resizing"
2021-01-06 10:24:36 +00:00
TreeHugger Robot
3cc7c97d60
Merge "Screenshots: ImageExporter"
2021-01-06 10:12:59 +00:00
Yo Chiang
1f5c6134d9
Merge "DynamicSystemInstallationService: Support remount for DSU guest system" am: 4896c7f2ac am: b64a3f5871 am: ddff5bca30
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1537222
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Ib984c05213a1974fcdc59a59ed0ff47d260720a8
2021-01-06 10:06:52 +00:00
Neil Fuller
8bdd40d2e5
Merge "Add an OWNERS file for location tz detection code"
2021-01-06 10:05:26 +00:00
Bernardo Rufino
3676cd9ac8
Merge "Allow Intent.ACSD for notification action trampolines for targetSdk < S"
2021-01-06 09:50:20 +00:00
Yo Chiang
ddff5bca30
Merge "DynamicSystemInstallationService: Support remount for DSU guest system" am: 4896c7f2ac am: b64a3f5871
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1537222
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Ic2468f5f90cc7ae789ab0a1b5eaa4262e279c429
2021-01-06 09:45:56 +00:00
Nataniel Borges
2f639030a5
Merge "Consider rounded corners in occluded by (tests)"
2021-01-06 09:39:06 +00:00
Bernardo Rufino
655252edfe
Perform null check before updating originating tokens
...
Turns out it's possible that when the callback is processed there is no
process attached to the ServiceRecord despite it being allowed for bg
activity starts "by start". This can happen for example if we call
allowBgActivityStartsOnServiceStart() twice without a process attached.
This was handled before ag/12559801, so also needs to be handled in the
new code-path.
Bug: 176813978
Test: atest BackgroundActivityLaunchTest
Change-Id: I2024f5cb4da78a93c868a63e45c00567c20848ba
2021-01-06 09:30:30 +00:00
Yo Chiang
b64a3f5871
Merge "DynamicSystemInstallationService: Support remount for DSU guest system" am: 4896c7f2ac
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1537222
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I428a4b0bc668e1895a8e3e36c0f7cc5801ccf92b
2021-01-06 09:22:37 +00:00
Yunfan Chen
87efb59f2b
Add WM owners to the OWNERS of the related core tests
...
Update the OWNERS in core tests to let WM OWNERS own the related tests.
Test: Presubmit
Change-Id: Ib4de6fb3bc523dbe8c7418e76de255a11a6bde66
2021-01-06 18:19:12 +09:00
Jacqueline Bronger
cf881f5965
Merge "Intent flags for toggling tv notification panel."
2021-01-06 09:12:07 +00:00
TreeHugger Robot
9df7512c55
Merge "Demonstrate per Uid screen energy measurement in BatteryStatsViewer"
2021-01-06 09:07:05 +00:00
Mark Renouf
c2c5075bbf
Screenshots: ImageExporter
...
Performs the same image writing steps as SaveImageInBackgroundTask
but with only image export functions, packaged in a neatly composable
and testable form.
Bug: 175744393
Test: atest SystemUITests:com.android.systemui.screenshot.ImageExporterTest
Change-Id: Ifbdf53daaeaf366da6ae5a25b4756e289172ab66
2021-01-06 08:38:22 +00:00
Yo Chiang
4896c7f2ac
Merge "DynamicSystemInstallationService: Support remount for DSU guest system"
2021-01-06 08:37:43 +00:00
Yo Chiang
cd65cd4e04
Change log tag of DynamicSystemClient to match class name
...
Expand the "DynSystem" abbreviation to "DynamicSystem".
For simpler log grepping.
Bug: 165471299
Test: No
Change-Id: Ibec692ae45539dacd55e13ffaa903b58f3bf0417
2021-01-06 08:24:16 +00:00