TreeHugger Robot
3542f6c0bf
Merge "clean-up unrequired slice access from default home app"
2020-08-11 18:34:01 +00:00
Zhen Sun
efa2e913ae
Merge "Add TvSettings enum for apps only mode"
2020-08-11 17:52:26 +00:00
TreeHugger Robot
590d9f30c4
Merge "Use vibrator HAL controller for prebaked effect"
2020-08-11 17:46:53 +00:00
TreeHugger Robot
73b0bbd16b
Merge "Minor fixes handling START_USER_SWITCH_UI_MSG:"
2020-08-11 17:19:42 +00:00
Felipe Leme
7b1d46ca58
Merge "Fixed UserManagerService / UserSystemPackageInstaller dump() methods"
2020-08-11 16:56:38 +00:00
TreeHugger Robot
3bced6c536
[automerger skipped] Merge "Add EBS interface to BatteryController" into rvc-qpr-dev am: 05afc4f43b am: c421452ce8 -s ours
...
am skip reason: Change-Id Ie450194ee34b319cff926a49aca99544dcca0e9c with SHA-1 c553798e85 is in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12333942
Change-Id: Ie637d3669ccc3a3e65a469b64985bc1c5f7b9019
2020-08-11 15:54:48 +00:00
Neil Fuller
103d2b3787
Merge "Change TimeZoneDetectorStrategyImpl to allow geo"
2020-08-11 15:42:55 +00:00
TreeHugger Robot
c421452ce8
Merge "Add EBS interface to BatteryController" into rvc-qpr-dev am: 05afc4f43b
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12333942
Change-Id: I5d2e8d98aef1137d57136dd10af9ffbe07ea3f2a
2020-08-11 15:35:43 +00:00
TreeHugger Robot
dee8006160
Merge "Increase parsing comparison test timeouts"
2020-08-11 15:30:36 +00:00
TreeHugger Robot
05afc4f43b
Merge "Add EBS interface to BatteryController" into rvc-qpr-dev
2020-08-11 15:16:14 +00:00
Lais Andrade
c45394fdb5
Use vibrator HAL controller for prebaked effect
...
The new controller always triggers the callback, even if the HAL does
not support it. This requires changes in the VibratorService.java code
to rely on the native callback and use the ASYNC_TIMEOUT_MULTIPLIER for
the fallback.
This is the last step on the vibrator controller integration, and thus
removed the unused code from native VibratorService.cpp.
Bug: b/153418251
Test: atest FrameworksServicesTests:VibratorServiceTest
Change-Id: I65921dac3758a4f53612928a593af7461566a024
2020-08-11 15:09:03 +00:00
Anton Hansson
8f9b27f1b2
Revert "Add bp-based disting of android stubs" am: 9b0a74f0a3 am: ef59d8ff00 am: 7bdd9fbd7f
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12346268
Change-Id: I7b7cde662cdab0862de3b849293f942d1eb9cb2b
2020-08-11 14:41:11 +00:00
Riddle Hsu
44df6d7e0d
[automerger skipped] Resume next activity if pausing app died am: 9c62ef63fd -s ours am: 1341ae4b16 -s ours am: ccef3db29a -s ours
...
am skip reason: Change-Id I635fceb9cf7b782f6ffbb9ebef7cb69053f64a0b with SHA-1 9c62ef63fd is in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12343635
Change-Id: I507f18ac43c0f8c42ed652f237ccdd94c985553d
2020-08-11 14:40:59 +00:00
Fabian Kozynski
1597fbf48f
Merge "Change description of privacy icons in Statusbar" into rvc-qpr-dev am: 6bace95e52 am: 3ba41889a0
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12346145
Change-Id: Ided15c932a3f5ad46ee93aba31bbf272fd0a41c3
2020-08-11 14:40:48 +00:00
Riddle Hsu
1dc22266f7
[automerger skipped] Resume next activity if pausing app died am: 9c62ef63fd am: 2f5ebc895b -s ours am: 55e952dec5 -s ours
...
am skip reason: Change-Id I635fceb9cf7b782f6ffbb9ebef7cb69053f64a0b with SHA-1 f2e7da7a64 is in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12343635
Change-Id: I908d442d88b3c6927c9fdb6ed8d10ab76daacab9
2020-08-11 14:40:29 +00:00
Anton Hansson
7bdd9fbd7f
Revert "Add bp-based disting of android stubs" am: 9b0a74f0a3 am: ef59d8ff00
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12346268
Change-Id: I899b5727f235703de52798ea1c0e0ac7f9202c97
2020-08-11 14:34:18 +00:00
Riddle Hsu
ccef3db29a
[automerger skipped] Resume next activity if pausing app died am: 9c62ef63fd -s ours am: 1341ae4b16 -s ours
...
am skip reason: Change-Id I635fceb9cf7b782f6ffbb9ebef7cb69053f64a0b with SHA-1 9c62ef63fd is in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12343635
Change-Id: I9ffb771013079f7b59ba3dadddbd5f8ccd5ab5c0
2020-08-11 14:22:18 +00:00
Anton Hansson
ef59d8ff00
Revert "Add bp-based disting of android stubs" am: 9b0a74f0a3
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12346268
Change-Id: I00bcb2a295570e7d99747e104fa866d5c50f2c2a
2020-08-11 14:22:10 +00:00
Fabian Kozynski
3ba41889a0
Merge "Change description of privacy icons in Statusbar" into rvc-qpr-dev am: 6bace95e52
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12346145
Change-Id: I6289dfe3795a497ea30e99b38e3e32b8ac1c9c4d
2020-08-11 14:22:05 +00:00
Riddle Hsu
55e952dec5
[automerger skipped] Resume next activity if pausing app died am: 9c62ef63fd am: 2f5ebc895b -s ours
...
am skip reason: Change-Id I635fceb9cf7b782f6ffbb9ebef7cb69053f64a0b with SHA-1 f2e7da7a64 is in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12343635
Change-Id: I707a46273f583784ed0ccc0dc30126e09a0649c0
2020-08-11 14:20:45 +00:00
Riddle Hsu
1341ae4b16
[automerger skipped] Resume next activity if pausing app died am: 9c62ef63fd -s ours
...
am skip reason: Change-Id I635fceb9cf7b782f6ffbb9ebef7cb69053f64a0b with SHA-1 f2e7da7a64 is in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12343635
Change-Id: I40be441957ef7770308acc64ccb9a77c7d598471
2020-08-11 14:05:19 +00:00
Riddle Hsu
2f5ebc895b
Resume next activity if pausing app died am: 9c62ef63fd
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12343635
Change-Id: Iaacc56f1227007e11bed6c9cfe1662ac5c517110
2020-08-11 14:04:15 +00:00
Fabian Kozynski
6bace95e52
Merge "Change description of privacy icons in Statusbar" into rvc-qpr-dev
2020-08-11 14:04:14 +00:00
TreeHugger Robot
522be5a228
Merge "Fix incorrect use of UserHandle#getUserHandleForUid(int uid)"
2020-08-11 13:48:33 +00:00
Nadav Bar
5869ec6417
Merge "Fix SystemCaptionsManagerService to re-bind after a force stop"
2020-08-11 13:42:12 +00:00
Neil Fuller
8164e67726
Change TimeZoneDetectorStrategyImpl to allow geo
...
Change TimeZoneDetectorStrategyImpl to allow a new "geo only" mode.
The strategy can now exist in one of two modes:
1) Telephony signals only
2) Geolocation signals only
They may later joined by a third "hybrid" mode where we can
experiment with how to blend the two (if that seems like it will provide
better results), or perform a fallback from one to the other.
Note that nothing is actually making Geolocation-based suggestions yet.
The shell command line can be used to simulate geolocation suggestions
in the meantime.
This commit doesn't contain real settings logic: the settings storage and
logic will be added in a follow-up commit.
Bug: 149014708
Test: atest com.android.server.timezonedetector
Test: atest core/tests/coretests/src/android/app/timezonedetector/
Change-Id: I83f8f64d40255567c035a67741b18ecaf6f0561d
2020-08-11 14:25:38 +01:00
TreeHugger Robot
39de3059e6
Merge "setCurrentState(DESTROYED) called from main thread"
2020-08-11 13:07:52 +00:00
Ryan Lin
ba91c6c33f
Merge "Add WindowMagnificationAnimationController for animation"
2020-08-11 12:57:59 +00:00
Anton Hansson
9b0a74f0a3
Revert "Add bp-based disting of android stubs"
...
This reverts commit d116c60383 .
Bug: 162595755
Test: unzip -l out/dist/android_system.jar | grep resources.arsc
Change-Id: I1445bc742ea2f895291ffd80bdc0cf86e1b8878a
2020-08-11 13:06:17 +01:00
TreeHugger Robot
4676898b8d
Merge "Fix the save UI does not restore"
2020-08-11 12:00:08 +00:00
Ruslan Tkhakokhov
e18f95849d
Merge "[FSD2D]: Ignore eligiblity checks in BackupAgent"
2020-08-11 11:47:34 +00:00
Ruslan Tkhakokhov
3567b842e7
[FSD2D]: Ignore eligiblity checks in BackupAgent
...
In case of device-to-device migration:
1. Include no-backup and cache dirs.
2. Ignore restore eligibility check for file paths.
Bug: 160407842
Test: 1. atest BackupAgentTest
2. Manual: Verify that all files are backed up / restored for
migrations.
Change-Id: I011c954c3e9e09828d2fb65fdfe96d8b6a6ba150
2020-08-11 11:46:49 +00:00
Treehugger Robot
2fed99d3c0
Merge "Update language to comply with Android's inclusive language guidance" am: bad5c4ec49 am: 99ed998f0e am: 31af0da082 am: a23c657c17 am: 3b8756f053
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1393497
Change-Id: I1b0d35f77c38ee2425dc74fa6b9b2e84f1165c19
2020-08-11 09:41:10 +00:00
Treehugger Robot
3b8756f053
Merge "Update language to comply with Android's inclusive language guidance" am: bad5c4ec49 am: 99ed998f0e am: 31af0da082 am: a23c657c17
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1393497
Change-Id: Id90b2b13d47d274ba2c40bccbf0507d05011c576
2020-08-11 09:15:02 +00:00
Treehugger Robot
a23c657c17
Merge "Update language to comply with Android's inclusive language guidance" am: bad5c4ec49 am: 99ed998f0e am: 31af0da082
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1393497
Change-Id: I8f14f27529dc42e4bf8515ce317024f468622b54
2020-08-11 08:57:42 +00:00
Treehugger Robot
31af0da082
Merge "Update language to comply with Android's inclusive language guidance" am: bad5c4ec49 am: 99ed998f0e
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1393497
Change-Id: Ibea8b326aba347acfd948310378580940c3f0cd7
2020-08-11 08:37:55 +00:00
Treehugger Robot
99ed998f0e
Merge "Update language to comply with Android's inclusive language guidance" am: bad5c4ec49
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1393497
Change-Id: If5f29aac921bf42cbb219715e5e35808b8e47d33
2020-08-11 08:26:11 +00:00
Treehugger Robot
bad5c4ec49
Merge "Update language to comply with Android's inclusive language guidance"
2020-08-11 08:10:58 +00:00
Nadav Bar
762e0f9a2e
Fix SystemCaptionsManagerService to re-bind after a force stop
...
This change also fixes a bug in AbstractMasterSystemService where
following a "force stop", the per-user service was not updated if PACKAGE_RESTART_POLICY_REFRESH_EAGER was specified. These behavior resulted with getServiceComponentName returning null and the service not being restarted.
Bug: 160735520
Bug: 160693548
Bug: 160644088
Change-Id: I2f66273bd90e9bb220f799d8ab3b024637b33c24
Test: Manually
2020-08-11 09:44:05 +03:00
Junyu Lai
5fed70ab92
[automerger skipped] Merge "Fix fd leak in KeepaliveTracker." into rvc-d1-dev am: c9f7253224 am: db24dfba36 -s ours am: 3c68185224 -s ours
...
am skip reason: Change-Id Ice9fc9abe2959a84ad138a95c900dff676653665 with SHA-1 e5a64d49da is in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12325557
Change-Id: I6544430f7e5990b12e9a19906b52462bf436b8af
2020-08-11 05:37:37 +00:00
Junyu Lai
90b0905e20
[automerger skipped] Merge "Fix fd leak in KeepaliveTracker." into rvc-d1-dev am: c9f7253224 -s ours am: 4dd39b4cb6 -s ours am: c12434d355 -s ours
...
am skip reason: Change-Id Ice9fc9abe2959a84ad138a95c900dff676653665 with SHA-1 a67198dbfd is in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12325557
Change-Id: Ia469018dff2edb9a636c3d148040764491e6bc94
2020-08-11 05:37:23 +00:00
Riddle Hsu
9c62ef63fd
Resume next activity if pausing app died
...
If the top activity is crashed before showing any window, when its
process reported dead, it will be regarded as no visible activity
and no need to resume next activity. That may lead to the next top
activity remains in paused state and may be unresponsive.
Bug: 159951007
Test: atest ActivityTaskManagerServiceTests# \
testResumeNextActivityOnCrashedAppDied
Change-Id: I635fceb9cf7b782f6ffbb9ebef7cb69053f64a0b
Merged-In: I635fceb9cf7b782f6ffbb9ebef7cb69053f64a0b
(cherry picked from commit f2e7da7a64 )
2020-08-11 05:35:51 +00:00
Junyu Lai
3c68185224
[automerger skipped] Merge "Fix fd leak in KeepaliveTracker." into rvc-d1-dev am: c9f7253224 am: db24dfba36 -s ours
...
am skip reason: Change-Id Ice9fc9abe2959a84ad138a95c900dff676653665 with SHA-1 e5a64d49da is in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12325557
Change-Id: Ia46ccaf9e9c1f5d77f2da1adc7aa0fb9c9963284
2020-08-11 05:29:27 +00:00
Junyu Lai
c12434d355
[automerger skipped] Merge "Fix fd leak in KeepaliveTracker." into rvc-d1-dev am: c9f7253224 -s ours am: 4dd39b4cb6 -s ours
...
am skip reason: Change-Id Ice9fc9abe2959a84ad138a95c900dff676653665 with SHA-1 a67198dbfd is in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12325557
Change-Id: Ib986336e2d7ef9c34474cc8c21d181f680b4823e
2020-08-11 05:28:38 +00:00
TreeHugger Robot
cb5167db61
Merge "Partial Config Update: Matchers"
2020-08-11 05:25:00 +00:00
Junyu Lai
db24dfba36
Merge "Fix fd leak in KeepaliveTracker." into rvc-d1-dev am: c9f7253224
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12325557
Change-Id: I277aa6490272eb83eca87d01f0df1b6cf08f137e
2020-08-11 05:16:15 +00:00
Junyu Lai
4dd39b4cb6
[automerger skipped] Merge "Fix fd leak in KeepaliveTracker." into rvc-d1-dev am: c9f7253224 -s ours
...
am skip reason: Change-Id Ice9fc9abe2959a84ad138a95c900dff676653665 with SHA-1 a67198dbfd is in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12325557
Change-Id: Ie4999416cdf9e3a05f3193e3402eae3129481703
2020-08-11 05:14:45 +00:00
Jackal Guo
be309d3421
Merge "Update language to comply with Android's inclusive language guidance"
2020-08-11 05:06:50 +00:00
Junyu Lai
c9f7253224
Merge "Fix fd leak in KeepaliveTracker." into rvc-d1-dev
2020-08-11 05:04:34 +00:00
Jaewan Kim
c8fc993b42
Fix incorrect use of UserHandle#getUserHandleForUid(int uid)
...
Two issues were mixed here.
issue 1) User ID was used when UID was necessary.
issue 2) Caller UID was used when checking target UID.
Note that this bug would affect multi-user environment.
Bug: 162548695
Test: Build and run CTS
Change-Id: I83909b4a6c82af805a26848fe4a0189c579ddf0d
2020-08-11 14:01:04 +09:00