Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
751,953 Commits 3 Branches 0 Tags
8cf7c034deaddc3dd949854aaacbc2dd5696e192
Commit Graph

751953 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Jack Yu
8cf7c034de [automerger skipped] Merge "Used single TCP configuration for devices" am: 71649aa3f4 am: 5c11d472e2 am: d80c079b8f -s ours 
am skip reason: Merged-In I1f19e1217f7e7da37b3dd3b511d4859d77ec7bad with SHA-1 ee410d34a6 is already in history

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

Change-Id: Ia58e2bfa2ab2fc6e9ba8b47567c7528f1b14a3b9
 2022-03-15 18:15:56 +00:00
TreeHugger Robot
73d88c5133 [automerger skipped] Merge changes from topic "presubmit-am-5e22897cb56644e4abaab85d2e0ec30e-sc-v2-dev" into sc-v2-dev-plus-aosp am: fefc274c86 -s ours 
am skip reason: Merged-In I924f917fbf757d2c3866fcd60de2fbfccae2eb6a with SHA-1 88f4dbce89 is already in history

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

Change-Id: I7ebba3b932d53d0394da8292bc4a66f7363c5118
 2022-03-15 18:15:03 +00:00
Presubmit Automerger Backend
992cd2ce5a [automerger skipped] [automerge] Defer MessagingMessage#recycle until bind ends 2p: 3c52f4881d am: e6038b6cb3 -s ours 
am skip reason: Merged-In I924f917fbf757d2c3866fcd60de2fbfccae2eb6a with SHA-1 88f4dbce89 is already in history

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

Change-Id: If466fe7c557571900f2965284a8c2753f8cde74e
 2022-03-15 18:14:36 +00:00
Nikita Dubrovsky
30ccb6bca9 Merge "Update READ_CLIPBOARD_IN_BACKGROUND to be grantable via roles" into tm-dev 2022-03-15 18:05:28 +00:00
Jack Yu
d80c079b8f Merge "Used single TCP configuration for devices" am: 71649aa3f4 am: 5c11d472e2 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2022637

Change-Id: I985f13cd424b0baf8d31fe9236a6be41441cf30b
 2022-03-15 17:50:16 +00:00
Matt Pietal
b633ed2b9c Merge changes from topic "presubmit-am-d05e9dc23fa04dc3b45b8fa33d154783-sc-dev" into sc-mainline-prod am: be8370734f 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17159706

Change-Id: I7c55f0ff4ca3d84bcbca6a783616236cc324e478
 2022-03-15 17:50:08 +00:00
TreeHugger Robot
fefc274c86 Merge changes from topic "presubmit-am-5e22897cb56644e4abaab85d2e0ec30e-sc-v2-dev" into sc-v2-dev-plus-aosp 
* changes:
  [automerge] Defer MessagingMessage#recycle until bind ends 2p: 3c52f4881d
  Defer MessagingMessage#recycle until bind ends
 2022-03-15 17:48:49 +00:00
Matt Pietal
8fb55d4172 Merge changes from topic "presubmit-am-d05e9dc23fa04dc3b45b8fa33d154783-sc-dev" into tm-dev 
* changes:
  [automerged blank] [DO NOT MERGE] Ignore flaky tests 2p: 5c85eadaa8 2p: f6e92bd5ff
  [automerge] [DO NOT MERGE] Ignore flaky tests 2p: 5c85eadaa8
  [DO NOT MERGE] Ignore flaky tests
 2022-03-15 17:37:13 +00:00
Matt Pietal
be8370734f Merge changes from topic "presubmit-am-d05e9dc23fa04dc3b45b8fa33d154783-sc-dev" into sc-mainline-prod 
* changes:
  [automerge] [DO NOT MERGE] Ignore flaky tests 2p: 5c85eadaa8
  [DO NOT MERGE] Ignore flaky tests
 2022-03-15 17:37:13 +00:00
Hongwei Wang
f103a2b19c [automerger skipped] Merge "Merge "Fix letterbox issue when auto-enter-pip from landscape" into sc-dev am: 5a59072018" into sc-mainline-prod am: 3579487d9e -s ours 
am skip reason: Merged-In Ie657d15d9edb9d07555bd166b5919bb12cb217e6 with SHA-1 ebe8550d03 is already in history

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

Change-Id: I2d1a3b4bfbffd6880fe3db24e48d96432f95804e
 2022-03-15 17:36:44 +00:00
Hongwei Wang
c3bea5e4df [automerger skipped] Merge "Fix letterbox issue when auto-enter-pip from landscape" into sc-dev am: 5a59072018 am: 9b5b669cd6 -s ours 
am skip reason: Merged-In Ie657d15d9edb9d07555bd166b5919bb12cb217e6 with SHA-1 ebe8550d03 is already in history

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

Change-Id: If6b89abf0fc423fd4aa212a373dbcea07ff8d033
 2022-03-15 17:36:21 +00:00
TreeHugger Robot
cb2836e240 Merge "[RemoteInputView] move data fields to Controller" into tm-dev 2022-03-15 17:25:57 +00:00
Jack Yu
5c11d472e2 Merge "Used single TCP configuration for devices" am: 71649aa3f4 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2022637

Change-Id: Ice8309b8975907bf3ddd2c01da8cea291125a52d
 2022-03-15 17:23:38 +00:00
Ahaan Ugale
d252376ed4 Merge "Use flag to control the restart period value." into tm-dev 2022-03-15 17:14:03 +00:00
TreeHugger Robot
5aa7a6bda6 [automerger skipped] Merge "Keyguard - Treat messsages to lock with priority" into sc-v2-dev am: da1701ce29 -s ours am: 25d5a2449e -s ours 
am skip reason: Merged-In I7585a0a5eeb308e0e32a4f77f581556d883b5cda with SHA-1 256b5f08a8 is already in history

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

Change-Id: Ie024b57fc22acde35e71a94dddf2f3bf466724c3
 2022-03-15 17:12:27 +00:00
Mady Mellor
1facd8a57b Merge "Allow submodule owners to approve resources in shell" am: 0bd7c7b932 am: 9963532438 am: e19ca05540 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2024744

Change-Id: I5b77e268a00b6ded0f74d26e1d23dec28599ce57
 2022-03-15 17:11:49 +00:00
Automerger Merge Worker
f848370f8d Merge changes from topic "am-af9507788a8b4331adddceb5131a255e" into tm-dev 
* changes:
  [automerger skipped] Merge changes from topic "mpietal_keyguard_priority-sc-dev-sc-v2-dev" into sc-v2-dev-plus-aosp am: 9b3222c464 -s ours
  [automerger skipped] [automerged blank] Keyguard - Treat messsages to lock with priority 2p: 256b5f08a8 am: 0a32838cfe -s ours
 2022-03-15 17:11:20 +00:00
TreeHugger Robot
d0b6f10a47 [automerger skipped] Merge changes from topic "mpietal_keyguard_priority-sc-dev-sc-v2-dev" into sc-v2-dev-plus-aosp am: 9b3222c464 -s ours 
am skip reason: Merged-In I7585a0a5eeb308e0e32a4f77f581556d883b5cda with SHA-1 21e48cf26b is already in history

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

Change-Id: I51a45c3f99595ca0b5bc76258e427048a5ce171f
 2022-03-15 17:11:04 +00:00
Bernardo Rufino
53b1556921 Merge "Cap alpha to max if SAW + FLAG_NOT_TOUCHABLE" into tm-dev 2022-03-15 17:10:43 +00:00
Presubmit Automerger Backend
23e4655db2 [automerger skipped] [automerged blank] Keyguard - Treat messsages to lock with priority 2p: 256b5f08a8 am: 0a32838cfe -s ours 
am skip reason: Merged-In I7585a0a5eeb308e0e32a4f77f581556d883b5cda with SHA-1 21e48cf26b is already in history

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

Change-Id: I2b3b095da4ba73ac58dc666d360a5d9cdc2e6290
 2022-03-15 17:10:39 +00:00
TreeHugger Robot
25d5a2449e [automerger skipped] Merge "Keyguard - Treat messsages to lock with priority" into sc-v2-dev am: da1701ce29 -s ours 
am skip reason: Merged-In I7585a0a5eeb308e0e32a4f77f581556d883b5cda with SHA-1 256b5f08a8 is already in history

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

Change-Id: Icb5e4a21c045a6aec02631c0b04b61c96b218784
 2022-03-15 17:10:12 +00:00
Raissa De Guzman
c66fa16f1e Merge "Re-add PackageVerifierTest to presubmit" into tm-dev 2022-03-15 17:09:21 +00:00
Hongwei Wang
3579487d9e Merge "Merge "Fix letterbox issue when auto-enter-pip from landscape" into sc-dev am: 5a59072018" into sc-mainline-prod 2022-03-15 17:07:45 +00:00
Michael Wachenschwanz
98a2f3a88b Merge "Fix units is getActiveRadioDuration documentation" into tm-dev 2022-03-15 17:06:05 +00:00
TreeHugger Robot
96a7b9ee75 Merge "Use compat framework to gate session actions" into tm-dev 2022-03-15 17:03:06 +00:00
Ahaan Ugale
e76e08874f Merge "Trusted Hotword: Disable periodic restarts." into tm-dev 2022-03-15 17:02:40 +00:00
Jack Yu
71649aa3f4 Merge "Used single TCP configuration for devices" 2022-03-15 16:58:08 +00:00
Mady Mellor
e19ca05540 Merge "Allow submodule owners to approve resources in shell" am: 0bd7c7b932 am: 9963532438 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2024744

Change-Id: Iaf7fb99e0e99aa710963686d28a4810f460f01ec
 2022-03-15 16:44:12 +00:00
Ytai Ben-tsvi
fe5ac369f9 Merge "Correctly initialize recognition events" into tm-dev 2022-03-15 16:43:10 +00:00
TreeHugger Robot
9b3222c464 Merge changes from topic "mpietal_keyguard_priority-sc-dev-sc-v2-dev" into sc-v2-dev-plus-aosp 
* changes:
  [automerged blank] Keyguard - Treat messsages to lock with priority 2p: 256b5f08a8
  Keyguard - Treat messsages to lock with priority
 2022-03-15 16:38:21 +00:00
TreeHugger Robot
da1701ce29 Merge "Keyguard - Treat messsages to lock with priority" into sc-v2-dev 2022-03-15 16:38:21 +00:00
Mady Mellor
9963532438 Merge "Allow submodule owners to approve resources in shell" am: 0bd7c7b932 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2024744

Change-Id: I46bfdc12acedc6a811c8c2e09be83d005ee2174a
 2022-03-15 16:16:29 +00:00
Riddle Hsu
597af5dae7 Merge "Preserve task when clearing top activities" into tm-dev 2022-03-15 16:15:38 +00:00
Mady Mellor
0bd7c7b932 Merge "Allow submodule owners to approve resources in shell" 2022-03-15 15:48:10 +00:00
Tiger Huang
12af01de23 Merge changes from topics "presubmit-am-5e82b57d626c41308e1301904b87a9f4", "presubmit-am-bf1f6ea5e8904183a244a4f4fcdf02bf" into tm-dev 
* changes:
  Don't perform another layout after finishPostLayoutPolicyLw
  Clean up the logic about FLAG_FORCE_NOT_FULLSCREEN
 2022-03-15 15:43:48 +00:00
Shaowei Shen
2b3a67a7f0 Merge "[Output Switcher] Update current device string based on product" into tm-dev 2022-03-15 15:31:54 +00:00
Kholoud Mohamed
784e20708d Merge "Start an activity cross profile in same task." into tm-dev 2022-03-15 15:20:54 +00:00
Arthur Hung
b1c7853e29 Merge "Prevent NPE for onKeyDown and onKeyUp" into tm-dev 2022-03-15 14:31:28 +00:00
Pat Manning
b9a92919ae Merge "Removing a failing test which isn't required." into tm-dev 2022-03-15 14:25:24 +00:00
TreeHugger Robot
671afd4ba9 Merge "DO NOT MERGE Only clamp off brightness from DOZE_INITIALIZED" into tm-dev 2022-03-15 14:22:18 +00:00
Jack Yu
be8950e358 Merge "Improved APN setting logging" into tm-dev 2022-03-15 14:00:40 +00:00
Fabian Kozynski
5e30ed8b64 Merge "Log NPE in QSAnimator" into tm-dev 2022-03-15 13:51:35 +00:00
Beverly Tai
76473a4ebf Merge "Use/update cached battery manager" into tm-dev 2022-03-15 13:08:46 +00:00
Beverly Tai
4631f1ad79 Merge "Cleanup KeyguardIndicationController on tearDown" into tm-dev 2022-03-15 13:05:21 +00:00
Joanne Chung
46e6944804 Use flag to control the restart period value. 
Bug: 224618257
Test: adb shell cmd device_config get/put voice_interaction \
restart_period_in_seconds works fine
Test: the value is expected by command: adb shell dumpsys \
voiceinteraction | grep RESTART_PERIOD_SECONDS

Change-Id: Icd8d19c2a482d0d6b9bf0432e2176ca10f3bd2eb
 2022-03-15 12:10:14 +00:00
shaoweishen
470e4b9a74 [Output Switcher] Update current device string based on product 
Bug: 219720166
Test: N/A
Change-Id: I8202aa5627751f8740bf85990bf7500f332294a1
 2022-03-15 11:34:38 +00:00
TreeHugger Robot
f05f4ec6b8 Merge "Rename API: DisconnectReasonToString" into tm-dev 2022-03-15 11:28:14 +00:00
Raissa De Guzman
60265a2981 Re-add PackageVerifierTest to presubmit 
The fix for the test is in
https://googleplex-android-review.git.corp.google.com/c/platform/vendor/xts/+/17074468
Bug: 215451390
Bug: 222348420
Bug: 222686066

Change-Id: I6c16a8028cae814c088c1b82eb2b6b7a4ec6a351
 2022-03-15 10:24:32 +00:00
TreeHugger Robot
78c4ef3d5b Merge "Rename ACTION_UPDATE_DEVICE_MANAGEMENT_ROLE_HOLDER" into tm-dev 2022-03-15 10:19:59 +00:00
Riddle Hsu
581a881e4f Merge "Handle intermediate task overlay for metrics logger" into tm-dev 2022-03-15 09:55:24 +00:00