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

642099 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Aaron Huang
3da57cc6e7 [automerger skipped] Merge "Rename *Iface* APIs to *Interface*" am: f281058618 am: 27d2960c50 am: 06e89d6c3b -s ours am: a9d2d9a81d -s ours 
am skip reason: Merged-In I38b476e762fb57fa88c4a789092d0af6f5330d80 with SHA-1 a10cc3aa60 is already in history

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

Change-Id: I9a0fba78ab81fa293bd8f45e69078b0cb678106c
 2021-05-14 10:27:08 +00:00
Treehugger Robot
6147d0838d Merge "Reference unreachable netId from INetd" am: da4644daf7 am: 99f78a5484 am: 8d8a727cf7 am: f0f896a0e4 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1708326

Change-Id: I0a5cfe1124d58170343f2b597d436a0b52f54b58
 2021-05-14 10:25:49 +00:00
TreeHugger Robot
a672331128 Merge "Address comments on ag/14486203" into sc-dev am: dc9b300cf3 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14540395

Change-Id: I4d1abc37dbb5a43cb1db58f3409c443607b68e65
 2021-05-14 10:25:22 +00:00
Aaron Huang
a9d2d9a81d [automerger skipped] Merge "Rename *Iface* APIs to *Interface*" am: f281058618 am: 27d2960c50 am: 06e89d6c3b -s ours 
am skip reason: Merged-In I38b476e762fb57fa88c4a789092d0af6f5330d80 with SHA-1 a10cc3aa60 is already in history

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

Change-Id: I39709941a1770435d9a2e221025b46eed5d32ea0
 2021-05-14 10:07:18 +00:00
Treehugger Robot
f0f896a0e4 Merge "Reference unreachable netId from INetd" am: da4644daf7 am: 99f78a5484 am: 8d8a727cf7 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1708326

Change-Id: Ia8db25ba86450341d4b9278eba350014fa3b880c
 2021-05-14 10:06:00 +00:00
TreeHugger Robot
dc9b300cf3 Merge "Address comments on ag/14486203" into sc-dev 2021-05-14 09:59:43 +00:00
Aaron Huang
06e89d6c3b Merge "Rename *Iface* APIs to *Interface*" am: f281058618 am: 27d2960c50 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1693585

Change-Id: I9aa62677f52ac78916c518d1378a05bda143f676
 2021-05-14 09:44:33 +00:00
Chiachang Wang
a999e5a2e8 Merge "Replace clearAll with withoutDefaultCapabilities" into sc-dev am: 1595a20d56 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14514111

Change-Id: I05ca1ba1582ed74d361d5f4a29bb390592a564b9
 2021-05-14 09:36:55 +00:00
Aaron Huang
27d2960c50 Merge "Rename *Iface* APIs to *Interface*" am: f281058618 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1693585

Change-Id: I62fa0403c8b2d78e7e7a90be8ac804576ec27456
 2021-05-14 09:36:36 +00:00
Treehugger Robot
8d8a727cf7 Merge "Reference unreachable netId from INetd" am: da4644daf7 am: 99f78a5484 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1708326

Change-Id: I2f14897dda29c6ea4469952e56a0fa0e1c8a9a8f
 2021-05-14 09:36:35 +00:00
Pierre Barbier de Reuille
b4c170f5d7 Merge "Test color mapping equivalent in O(n)" into sc-dev am: 429e2a8b6a 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14518395

Change-Id: I02a8fd03475970ea7761c7c38e31a0e0e87c7c7f
 2021-05-14 09:36:33 +00:00
TreeHugger Robot
b6bbc46341 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: I3836517b8d5ba1d64aa1f7fac8ee2fad953c43e1
 2021-05-14 09:36:12 +00:00
Chiachang Wang
1595a20d56 Merge "Replace clearAll with withoutDefaultCapabilities" into sc-dev 2021-05-14 09:32:42 +00:00
Aaron Huang
f281058618 Merge "Rename *Iface* APIs to *Interface*" 2021-05-14 09:11:29 +00:00
Pierre Barbier de Reuille
429e2a8b6a Merge "Test color mapping equivalent in O(n)" into sc-dev 2021-05-14 08:49:28 +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
57326ba651 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: I18399e29cd107a22c9fd16a581732630d0c135a5
 2021-05-14 08:39:35 +00:00
Treehugger Robot
99f78a5484 Merge "Reference unreachable netId from INetd" am: da4644daf7 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1708326

Change-Id: Iedbf9e9b150c95aa0da6a7b20af0dd1412703e2b
 2021-05-14 08:39:18 +00:00
Chalard Jean
d1b0a86a7c 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: Ie0b5d760de7ab86f19a28c5336a5b9589d9a2f50
 2021-05-14 08:39:08 +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
f27877ae89 Address comments on ag/14486203 
Bug: 186458024
Test: comment-only change
Change-Id: I7b086abbb57354086e8fb1a41c63140f2227173f
 2021-05-14 17:31:30 +09: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
b1d3cfbe78 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: Iecd61835eb7c921a874bf72b20a60bb9cf84e6c9
 2021-05-14 08:15:04 +00:00
Treehugger Robot
da4644daf7 Merge "Reference unreachable netId from INetd" 2021-05-14 08:08:08 +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
959b5210c1 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: I60570e14d89133df04b1aef5f87ff747bd923141
 2021-05-14 07:48:04 +00:00
Remi NGUYEN VAN
1766597148 [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: I789343ef7fbc27010d013df9f7323ec2dbc5a99f
 2021-05-14 07:47:59 +00:00
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
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
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
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
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
Chiachang Wang
2b14c9979d Replace clearAll with withoutDefaultCapabilities 
As the feedback from API review, the clearAll method in Builder
does not match the actual usage. Thus, remove it and replace
with withoutDefaultCapabilities to provide clearer usage.

Bug: 184735772
Test: make update-api ; m
Change-Id: Ida8d25d57504864f046e3403f593cc606fbfe982
CTS-Coverage-Bug: 186061922
 2021-05-14 14:53:47 +08: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
Ken Chen
1e8a69ec92 Reference unreachable netId from INetd 
Bug: 181579204
Test: m; atest FrameworksNetTests
Change-Id: Id0d30363abe583459a8022e7400aab1dd4f72939
 2021-05-14 14:30:43 +08: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
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
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
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