Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
642,057 Commits 3 Branches 0 Tags
5278849d4cf6c8a67fbdee2a281446542e4fa075
Commit Graph

642057 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Treehugger Robot
5278849d4c [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: Ib8ac813cb3e4a47fdb09b02ff9638658fb559e28
 2021-05-14 07:47: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
839fcd0f8c 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: I4f059ed0d220a3acda691ac6b4f569038563a81e
 2021-05-14 07:09:55 +00:00
Jing Ji
28d7e404f8 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: I29bc4ccd59070bb729d2df22a074736be8ff7bbe
 2021-05-14 07:09:18 +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
Hui Yu
4478771cff 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: I081663ed04eb09f52770169ec4b6d5f6b8e5028f
 2021-05-14 07:08:41 +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
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
Chris Li
a6d0e667b1 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: I3a33054ad7e25ef79bc9089d2dd5cc70eda30db9
 2021-05-14 06:25:08 +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
686c6a247e [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: Id8a515775f8262744d68b841726e3b6260008718
 2021-05-14 05:55:02 +00:00
Bill Yi
1d7046ecbe [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: I266cfae6d44800348e1018a32be674f0bf28e4a0
 2021-05-14 05:54:39 +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
f0fba1dad2 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: I0695bc1b9f710a331d18fae4cc933f223f6a5144
 2021-05-14 05:31:38 +00:00
Benedict Wong
893cc525d0 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: Iaa134ff3eebb4f501e06d13949e89c16355eb21f
 2021-05-14 05:31:32 +00:00
Yi Jiang
bb8d8b4797 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: If58e42d839b65df7972ecca54d5cfb4ae584568c
 2021-05-14 05:31:24 +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
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
90cebc9fc7 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: I52e4d271d7d07cd79f7ff934c334f703a470a47d
 2021-05-14 05:06:59 +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
35aa9f9cf2 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: I2cd462c1a64592f73b47fb0bd71151c870c4f5c4
 2021-05-14 04:33:26 +00:00
Huihong Luo
8eeb60045d 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: Ibb93db8313647dea6f12ff61fd1313c310cd0c62
 2021-05-14 04:32:31 +00:00
Yanting Yang
cc8116d1ec 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: I4dce569d2b547eddd2421779c6b752cf62f622eb
 2021-05-14 04:30:30 +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
Cassie Wang
4dbd446328 Merge "Have the shell request AppSearch global query permission." am: f37a782378 am: 6e11df3fe7 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1704125

Change-Id: Ife300434e555167d8e8808f8304f3e7761b17dfe
 2021-05-14 03:15:56 +00:00
Cassie Wang
6e11df3fe7 Merge "Have the shell request AppSearch global query permission." am: f37a782378 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1704125

Change-Id: I17c5b35ac84d031ce259bb65ee49e4e619eab76f
 2021-05-14 02:54:08 +00:00
Jerry Chang
fbd93a6f6e Merge "Fix wrong split bounds in legacy split flicker tests" into sc-dev am: 68667bdd3a 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14526747

Change-Id: Ie85a7b598b6fdf33fe841fd8b4aa55d44d9b524a
 2021-05-14 02:39:59 +00:00
Xiaoyu Jin
e8c7a1b04c Merge "Log InitializeStats in the platform" into sc-dev am: 193cbf3c74 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14483569

Change-Id: Ied9f5537d559f6707298c570b705380c05b64c93
 2021-05-14 02:39:51 +00:00
Lucas Dupin
ddb0559086 Merge "Fix colors for a11y" into sc-dev am: 1cee5ddce1 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14531949

Change-Id: I8089ce3b96d83ef974a5663f95bdb6a5c8159616
 2021-05-14 02:39:24 +00:00
Cassie Wang
f37a782378 Merge "Have the shell request AppSearch global query permission." 2021-05-14 02:36:27 +00:00
Jerry Chang
68667bdd3a Merge "Fix wrong split bounds in legacy split flicker tests" into sc-dev 2021-05-14 02:29:18 +00:00
Xiaoyu Jin
193cbf3c74 Merge "Log InitializeStats in the platform" into sc-dev 2021-05-14 02:25:22 +00:00
Lucas Dupin
1cee5ddce1 Merge "Fix colors for a11y" into sc-dev 2021-05-14 02:22:23 +00:00
Benedict Wong
9028cac4fe Custom network selection 
This change adds a basic prioritization framework in the VCN, and signal
strength thresholds for WiFi.

Bug: 188104094
Test: atest FrameworksVcnTests
Change-Id: Iee4e3dbecf1102ddc127a8c8daf08a00b6fccbbd
 2021-05-13 18:57:05 -07:00
TreeHugger Robot
1368cc47ff Merge "Log instead of throw exception when pkg not found" into sc-dev am: e90ea3aaba 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14537490

Change-Id: I0b504bf433ca6961baab748bc041a55dea22703e
 2021-05-14 01:42:35 +00:00
TreeHugger Robot
e90ea3aaba Merge "Log instead of throw exception when pkg not found" into sc-dev 2021-05-14 01:39:58 +00:00
Tiffany Nguyen
10b8595161 Merge "Log the battery saver changed atom on initialization." into sc-dev am: dcec9f1f38 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14419579

Change-Id: I33b5eeac8b40d307bc12499fc5946469c47a977d
 2021-05-14 01:35:23 +00:00
TreeHugger Robot
9f64dbc06d Merge "Fix some FD lifecycle issues" into sc-dev am: 3d1ab8c9ef 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14536562

Change-Id: I126042d6f602944f6319fdb23daff1e0e866397b
 2021-05-14 01:34:47 +00:00
Jing Ji
a4f4ae7761 Scan the downstream apps while updating oomadj for pending records 
Bug: 188060432
Test: atest ActivityManagerFgsBgStartTest
Test: atest FrameworksServicesTests:ActivityManagerTest
Test: atest MockingOomAdjusterTests
Test: atest CtsAppTestCases:ActivityManagerProcessStateTest
Change-Id: I8f2574d7cc6a59c76452f7cce57dab1b633fa7f5
 2021-05-13 18:18:36 -07:00
Tiffany Nguyen
dcec9f1f38 Merge "Log the battery saver changed atom on initialization." into sc-dev 2021-05-14 01:14:12 +00:00