Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
756,548 Commits 3 Branches 0 Tags
5fb583a2113e4bd2a403196873bcefdbc524e32e
Commit Graph

756548 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Bill Yi
5fb583a211 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I0373a13b4ebedd844a6f693fe1110710f0a280b9
 2022-03-16 14:22:17 +00:00
Matt Pietal
a4535ee866 Merge changes from topic "presubmit-am-d05e9dc23fa04dc3b45b8fa33d154783-sc-dev" into sc-mainline-prod am: be8370734f am: b633ed2b9c 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17159706

Change-Id: Icb22a7c5ff3a81ad83009cce0254e763eec882b4
 2022-03-15 17:51:03 +00:00
Automerger Merge Worker
ef2a90d0eb Merge changes from topic "am-c3d215184ad74e648e2028188e57acbc" 
* changes:
  Merge changes from topic "presubmit-am-d05e9dc23fa04dc3b45b8fa33d154783-sc-dev" into tm-dev am: 8fb55d4172
  [automerger skipped] [automerged blank] [DO NOT MERGE] Ignore flaky tests 2p: 5c85eadaa8 2p: f6e92bd5ff am: 78ea1cf5f2 -s ours
 2022-03-15 17:50:58 +00:00
Matt Pietal
b912ef3573 Merge changes from topic "presubmit-am-d05e9dc23fa04dc3b45b8fa33d154783-sc-dev" into tm-dev am: 8fb55d4172 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17159706

Change-Id: I0b17a08a18ca964e26cc7eef0f4776aa209825e2
 2022-03-15 17:50:21 +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
Matt Pietal
31f8be4b3d [automerger skipped] [automerged blank] [DO NOT MERGE] Ignore flaky tests 2p: 5c85eadaa8 2p: f6e92bd5ff am: 78ea1cf5f2 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I69f5ea83cb059b1fc8a51d1cba4f7c53ef536095
 2022-03-15 17:49:52 +00:00
Siarhei Vishniakou
e0de8487ae Merge "Remove log about reading/writing IOException" 2022-03-15 17:49:49 +00:00
Hongwei Wang
4803754228 [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: f103a2b19c -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: Ief0c88144515eb6f3514b479e9a198880fd3d320
 2022-03-15 17:48:42 +00:00
Hongwei Wang
c079098cd9 [automerger skipped] Merge "Fix letterbox issue when auto-enter-pip from landscape" into sc-dev am: 5a59072018 am: 9b5b669cd6 -s ours am: c3bea5e4df -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: Ic141c95d1bcbcfb3e614fc04ee27294486eabf5c
 2022-03-15 17:48:14 +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
Automerger Merge Worker
b8665724a0 Merge "Merge "[RemoteInputView] move data fields to Controller" into tm-dev am: cb2836e240" 2022-03-15 17:35:21 +00:00
TreeHugger Robot
48fab108ab Merge "[RemoteInputView] move data fields to Controller" into tm-dev am: cb2836e240 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17188894

Change-Id: I8f2617de7e88bf7c800d410949b6bcd2dc26bdc7
 2022-03-15 17:34:48 +00:00
Ganesh Olekar
66314d5073 Merge "Location provider check for subattribution" 2022-03-15 17:34:14 +00:00
TreeHugger Robot
cb2836e240 Merge "[RemoteInputView] move data fields to Controller" into tm-dev 2022-03-15 17:25:57 +00:00
Ahaan Ugale
8f18e2d792 Merge "Use flag to control the restart period value." into tm-dev am: d252376ed4 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17183529

Change-Id: I78e0ce2a9120840735c328c9f3261c5a34e98b78
 2022-03-15 17:16:58 +00:00
TreeHugger Robot
774c6ec8b4 [automerger skipped] Merge "Keyguard - Treat messsages to lock with priority" into sc-v2-dev am: da1701ce29 -s ours am: 25d5a2449e -s ours am: 5aa7a6bda6 -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: I8cb3615255938a7693342a4f15f0427fb45d110c
 2022-03-15 17:16:19 +00:00
Mady Mellor
915f4331a4 Merge "Allow submodule owners to approve resources in shell" am: 0bd7c7b932 am: 9963532438 am: e19ca05540 am: 1facd8a57b 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2024744

Change-Id: Idbca1af3ac3837e28ee7fed656edffd50e886df0
 2022-03-15 17:15:49 +00:00
Automerger Merge Worker
80bdda81aa [automerger skipped] Merge changes from topic "am-af9507788a8b4331adddceb5131a255e" into tm-dev am: f848370f8d -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: Ie2988cea12463ff2ad81b98cc7ba7a2bcf6bfe69
 2022-03-15 17:15:20 +00:00
TreeHugger Robot
45bd377856 [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: d0b6f10a47 -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: I3f3181ec19228b4ceff675f573cad61bbd93dd82
 2022-03-15 17:15:04 +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
Bernardo Rufino
c550a58714 Merge "Cap alpha to max if SAW + FLAG_NOT_TOUCHABLE" into tm-dev am: 53b1556921 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17182670

Change-Id: Ie13cd10f5a43236531fb504004176aa7bab35373
 2022-03-15 17:12:45 +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
Raissa De Guzman
fda3ecd87e Merge "Re-add PackageVerifierTest to presubmit" into tm-dev am: c66fa16f1e 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17070869

Change-Id: Idfb2381f6b6b1894a2a1781c0eeacb51e8c0822b
 2022-03-15 17:12:02 +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
Michael Wachenschwanz
f67bc52469 Merge "Fix units is getActiveRadioDuration documentation" into tm-dev am: 98a2f3a88b 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17190007

Change-Id: Iff39176f211ded42cd5eb057149d1533b5992491
 2022-03-15 17:11:26 +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
TreeHugger Robot
7ce580afa8 Merge "Use compat framework to gate session actions" into tm-dev am: 96a7b9ee75 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17158683

Change-Id: I71a071b7b35134bee591fad5e21df22c37301476
 2022-03-15 17:10:50 +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
Ahaan Ugale
f99e2d17a2 Merge "Trusted Hotword: Disable periodic restarts." into tm-dev am: e76e08874f 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17190848

Change-Id: Ie38320421fe5aa6664596627cc8b6b99604a628a
 2022-03-15 17:10:10 +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
Ytai Ben-tsvi
2224ac5fdb Merge "Correctly initialize recognition events" into tm-dev am: fe5ac369f9 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17188331

Change-Id: Ic8716827f8e534eac5b03bb9548d0099ccd7b7fc
 2022-03-15 16:44:50 +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
Riddle Hsu
40ef0c8c13 Merge "Preserve task when clearing top activities" into tm-dev am: 597af5dae7 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17190849

Change-Id: I0deeac13dce7ca05cbae277c523346a9cee7e96c
 2022-03-15 16:43:00 +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
Tiger Huang
8531eb26df Merge changes from topics "presubmit-am-5e82b57d626c41308e1301904b87a9f4", "presubmit-am-bf1f6ea5e8904183a244a4f4fcdf02bf" into tm-dev am: 12af01de23 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17157343

Change-Id: I37267806f4bffa152872b64ee2b05996ceea4702
 2022-03-15 15:51:46 +00:00
Shaowei Shen
09c540b82d Merge "[Output Switcher] Update current device string based on product" into tm-dev am: 2b3a67a7f0 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17181724

Change-Id: Ia5d5a39d5a7ec8ffef5739f506eecd1b13a3ec3e
 2022-03-15 15:50:39 +00:00