Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
648,502 Commits 3 Branches 0 Tags
502f72e1871afa1f044a3cb1031da74161b0f8f3
Commit Graph

648502 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
TreeHugger Robot
502f72e187 Merge "Read device types from ro.hdmi.cec_device_types." into sc-dev am: 54580d720d 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14443438

Change-Id: Id384b7e7565789de3a4bc089084f7af23284940c
 2021-05-14 09:36:19 +00:00
TreeHugger Robot
54580d720d Merge "Read device types from ro.hdmi.cec_device_types." into sc-dev 2021-05-14 08:45:38 +00:00
TreeHugger Robot
87ca1bf814 Merge "Exit dream mode on CEC wake message received" into sc-dev am: a31ca4d9d6 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14466779

Change-Id: I7bc07e2a5edc40535d2c8636961cd73b0a7baabb
 2021-05-14 08:39:48 +00:00
Chalard Jean
46fd88fead Merge "Make yield-to-bad-wifi behavior backward compatible with R" into sc-dev am: 544e424124 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14486203

Change-Id: Ie632067f98e51d6a5c98c7887c66be3d0d3df0dc
 2021-05-14 08:39:16 +00:00
TreeHugger Robot
a31ca4d9d6 Merge "Exit dream mode on CEC wake message received" into sc-dev 2021-05-14 08:37:51 +00:00
Chalard Jean
544e424124 Merge "Make yield-to-bad-wifi behavior backward compatible with R" into sc-dev 2021-05-14 08:21:27 +00:00
Tracy Zhou
231ed0cc3e Merge "Allow pulling down the status bar in visual immersive mode" into sc-dev am: 6b78883298 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13513299

Change-Id: I21785a24b4711ec49cf22b6be7cc4c19177c8c2b
 2021-05-14 08:15:41 +00:00
Tracy Zhou
6b78883298 Merge "Allow pulling down the status bar in visual immersive mode" into sc-dev 2021-05-14 07:56:51 +00:00
Jason Chang
7a834a4ea5 Merge "(1/n) Disabling OHM gesture in NavigationBar 3 Button mode" into sc-dev am: e8b62e4d23 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14185029

Change-Id: If523e14d512a1c0169bfb5b8ca6562bbce328706
 2021-05-14 07:48:17 +00:00
Remi NGUYEN VAN
29e8d492a8 [automerger skipped] Merge "Move NetIdManager, ProfileNetworkPreferences" am: e0316b6018 am: d461929832 am: 89b5529da3 -s ours am: eb84dceae3 -s ours 
am skip reason: Merged-In I454e8a0a8d0e0f9e6d21a8e8faf5a9e299962ad4 with SHA-1 5625b1f3c6 is already in history

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

Change-Id: I71514129a4a602b08be0b9916cab6abbe860e3e6
 2021-05-14 07:48:11 +00:00
Treehugger Robot
70e4b5e4cd [automerger skipped] Merge "Move connectivity sources to packages/Connectivity" am: b249b941ee am: 3eea8f3546 am: 0f8964439a -s ours am: 3699f612ff -s ours 
am skip reason: Merged-In I26d1a274058fa38763ad4f605549d880865b4d76 with SHA-1 9bf30999cc is already in history

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

Change-Id: I1e38bc8b1f5424baaea7e9a5ac21d1d70801b89a
 2021-05-14 07:48:03 +00:00
Jason Chang
e8b62e4d23 Merge "(1/n) Disabling OHM gesture in NavigationBar 3 Button mode" into sc-dev 2021-05-14 07:40:34 +00:00
Remi NGUYEN VAN
eb84dceae3 [automerger skipped] Merge "Move NetIdManager, ProfileNetworkPreferences" am: e0316b6018 am: d461929832 am: 89b5529da3 -s ours 
am skip reason: Merged-In I454e8a0a8d0e0f9e6d21a8e8faf5a9e299962ad4 with SHA-1 5625b1f3c6 is already in history

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

Change-Id: I15d4f795062ca5f44b9291e14c96e7fa6890e98a
 2021-05-14 07:26:47 +00:00
Treehugger Robot
3699f612ff [automerger skipped] Merge "Move connectivity sources to packages/Connectivity" am: b249b941ee am: 3eea8f3546 am: 0f8964439a -s ours 
am skip reason: Merged-In I26d1a274058fa38763ad4f605549d880865b4d76 with SHA-1 9bf30999cc is already in history

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

Change-Id: Idf91bcf36f6e79ab7f5c91d9939a3b7f742d73dd
 2021-05-14 07:26:24 +00:00
Riddle Hsu
1256ef8b12 Merge "Minor cleanup of Task" into sc-dev am: 24367cc06c 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14522580

Change-Id: I3b522fce3a0e45b5912eb96446306b98291c3e8b
 2021-05-14 07:10:14 +00:00
Jing Ji
2289fe396a Merge "Handle the AM error dialogs in system UI thread" into sc-dev am: 75e3baedbb 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14537657

Change-Id: I0af39bf9140585dae01c38dda7d701d4424e31f5
 2021-05-14 07:09:55 +00:00
Hui Yu
6e11bb3ca2 Merge "Scan the downstream apps while updating oomadj for pending records" into sc-dev am: 19e79e066e 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14535946

Change-Id: I9d8e8d5364306b82e4154d56f9e781672ecd2555
 2021-05-14 07:09:13 +00:00
Remi NGUYEN VAN
89b5529da3 Merge "Move NetIdManager, ProfileNetworkPreferences" am: e0316b6018 am: d461929832 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1705549

Change-Id: I486b0d2759200a5a1bb9679577f5d97ea43c252b
 2021-05-14 07:08:58 +00:00
Treehugger Robot
0f8964439a Merge "Move connectivity sources to packages/Connectivity" am: b249b941ee am: 3eea8f3546 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1706845

Change-Id: Ia2b0715ed1f144216c1f64069757bf717a3f083f
 2021-05-14 07:08:44 +00:00
Riddle Hsu
24367cc06c Merge "Minor cleanup of Task" into sc-dev 2021-05-14 06:54:29 +00:00
Jing Ji
75e3baedbb Merge "Handle the AM error dialogs in system UI thread" into sc-dev 2021-05-14 06:49:47 +00:00
Remi NGUYEN VAN
d461929832 Merge "Move NetIdManager, ProfileNetworkPreferences" am: e0316b6018 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1705549

Change-Id: Ib8967ac75b038202430a74276a632b37973ed92b
 2021-05-14 06:47:49 +00:00
Hui Yu
19e79e066e Merge "Scan the downstream apps while updating oomadj for pending records" into sc-dev 2021-05-14 06:41:56 +00:00
Treehugger Robot
3eea8f3546 Merge "Move connectivity sources to packages/Connectivity" am: b249b941ee 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1706845

Change-Id: Id619f74f84699c8f63edad37beb63537b7c06b3d
 2021-05-14 06:41:07 +00:00
Chalard Jean
52e109540b Make yield-to-bad-wifi behavior backward compatible with R 
Yielding cell wins to exiting wifi (whether good or bad).
It loses to bad wifi that's not exiting.

In R, yielding to bad wifi only affects wifis that are
unvalidated, but a wifi that is exiting should still be
dropped in favor of a cell that yields to bad wifi.

I had misunderstood the policy and implemented it wrong.
Now it's implemented right, and has careful tests.

Test: new tests for this
Bug: 186458024
Change-Id: Ib8637100d491e72a2edb837584ce55b7dda58524
 2021-05-14 15:27:12 +09:00
Chris Li
de6bcfcaa4 Merge "Determine whether to support activities in multi window (7/n)" into sc-dev am: da4381222a 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14427494

Change-Id: I6aff9483c6599dc9a80e86c7122e4898a860011b
 2021-05-14 06:25:22 +00:00
Remi NGUYEN VAN
e0316b6018 Merge "Move NetIdManager, ProfileNetworkPreferences" 2021-05-14 06:23:24 +00:00
Treehugger Robot
b249b941ee Merge "Move connectivity sources to packages/Connectivity" 2021-05-14 06:22:36 +00:00
Chris Li
da4381222a Merge "Determine whether to support activities in multi window (7/n)" into sc-dev 2021-05-14 06:10:40 +00:00
Bill Yi
0b9cf934ca [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: 4d6a6c2b5f -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I6f0e38f5983bf6baab5578a7c96fc11934efee8b
 2021-05-14 05:55:55 +00:00
Bill Yi
48b307d3fb [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: 2e95c84225 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I9a0b42b08daad117b75234b0bbe66fd01cb10968
 2021-05-14 05:55:36 +00:00
Bill Yi
4d6a6c2b5f Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev 2021-05-14 05:47:25 +00:00
Bill Yi
2e95c84225 Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev 2021-05-14 05:47:19 +00:00
Xiaoyu Jin
b5532b201a Merge "Log CallStats for more api calls" into sc-dev am: 05e3aca989 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14484870

Change-Id: I338c6e53f87321b8dc802f509e12d8df16e8c14a
 2021-05-14 05:31:59 +00:00
Benedict Wong
3a48bd9de9 Merge "Custom network selection" am: bc3638ce5d am: b3f0495383 am: 2a86eae65e am: d9c05c23e6 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1706226

Change-Id: Ia3cff6f7e36f60f4928960f3e62a291c004cb432
 2021-05-14 05:31:49 +00:00
Yi Jiang
b8c7153aa3 Merge "Assigns Ids to the internal rotation resolver callback." into sc-dev am: aa457f8abb 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14255000

Change-Id: Ib84e3d7e6ad727bace762d50b364d8c03933da85
 2021-05-14 05:31:36 +00:00
Xiaoyu Jin
05e3aca989 Merge "Log CallStats for more api calls" into sc-dev 2021-05-14 05:26:58 +00:00
Benedict Wong
d9c05c23e6 Merge "Custom network selection" am: bc3638ce5d am: b3f0495383 am: 2a86eae65e 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1706226

Change-Id: Icdf319d564e4eab468d9d4e722716a2ef7d2c3cd
 2021-05-14 05:25:38 +00:00
Yi Jiang
aa457f8abb Merge "Assigns Ids to the internal rotation resolver callback." into sc-dev 2021-05-14 05:14:25 +00:00
Jerry Chang
430d02e4fb Merge "Only reparent controlling tasks when entering split" into sc-dev am: c0302f5092 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14502545

Change-Id: I15fdfe970c72f5f72d5853dbb61657c1d48d0eb2
 2021-05-14 05:09:10 +00:00
Benedict Wong
2a86eae65e Merge "Custom network selection" am: bc3638ce5d am: b3f0495383 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1706226

Change-Id: I242837ed1442b1537120c6e4a07d493530de829c
 2021-05-14 05:09:06 +00:00
Jerry Chang
c0302f5092 Merge "Only reparent controlling tasks when entering split" into sc-dev 2021-05-14 04:53:16 +00:00
Benedict Wong
b3f0495383 Merge "Custom network selection" am: bc3638ce5d 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1706226

Change-Id: Idd12259974b19a20a6969a0afce14c4825492138
 2021-05-14 04:45:44 +00:00
Cassie Wang
0f22f72133 Merge "Have the shell request AppSearch global query permission." am: f37a782378 am: 6e11df3fe7 am: 4dbd446328 am: 7c41518fc2 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1704125

Change-Id: I0e5031220c1892787c78e97273c2695ee69b424d
 2021-05-14 04:33:53 +00:00
Huihong Luo
fdb85847d3 Merge "Fix leakage of ASurfaceTransactionCallback" into sc-dev am: f410f8134f 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14454598

Change-Id: Iff8450e21585a439ee59c523e3cf7d7f23a580f1
 2021-05-14 04:33:32 +00:00
Yanting Yang
27744c4966 Merge "Enable app name to show up to 2 lines" into sc-dev am: 23f813e89b 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14526748

Change-Id: Idb1d792e783ee15d217e5b79a5666aefc0209143
 2021-05-14 04:32:32 +00:00
Benedict Wong
bc3638ce5d Merge "Custom network selection" 2021-05-14 04:22:03 +00:00
Cassie Wang
7c41518fc2 Merge "Have the shell request AppSearch global query permission." am: f37a782378 am: 6e11df3fe7 am: 4dbd446328 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1704125

Change-Id: Ib0e16ff2dbcdb5655723058c02eab414b7beaf6d
 2021-05-14 03:35:10 +00:00
Huihong Luo
f410f8134f Merge "Fix leakage of ASurfaceTransactionCallback" into sc-dev 2021-05-14 03:33:53 +00:00
Yanting Yang
23f813e89b Merge "Enable app name to show up to 2 lines" into sc-dev 2021-05-14 03:29:53 +00:00