Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
635,127 Commits 3 Branches 0 Tags
f4c2db001f48bc4781663b0a2ef8489f31a1307d
Commit Graph

635127 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Chiachang Wang
f4c2db001f Merge "Rename APIs in NetworkAgentConfig.Builder" am: a0445d3546 am: 1de3108a3f am: 9a9e7b1bab 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1669047

Change-Id: I1988750dd4b65a3d74c33c8fc120bb3bcb705320
 2021-04-12 15:14:26 +00:00
Paul Hu
3ce4d69811 Merge "Remove TcpRepairWindow from module-lib API" am: b82fad9aa9 am: 33986467a7 am: ee4155624a 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1671788

Change-Id: I1d472c9cffaa0c7f35b284b97fa374b03232a7f4
 2021-04-12 15:13:48 +00:00
Lais Andrade
6304a50365 Merge "Ignore new vibrations for ongoing alarm vibrations" into sc-dev 2021-04-12 15:00:58 +00:00
Mady Mellor
02b75bb425 Merge "API Update: extra_is_bubbled -> Activity#isLaunchedFromBubble" into sc-dev 2021-04-12 14:53:01 +00:00
Lais Andrade
7d9605d7c1 Merge "Small fixes to changes related to PWLE implementation" into sc-dev 2021-04-12 14:50:02 +00:00
Chiachang Wang
9a9e7b1bab Merge "Rename APIs in NetworkAgentConfig.Builder" am: a0445d3546 am: 1de3108a3f 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1669047

Change-Id: Ia16a26e64e65687faf6303c392c4a85de52129e3
 2021-04-12 14:47:46 +00:00
Paul Hu
ee4155624a Merge "Remove TcpRepairWindow from module-lib API" am: b82fad9aa9 am: 33986467a7 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1671788

Change-Id: Ib89ecce40b1361b9f74d66d7969035c7b94702e0
 2021-04-12 14:46:35 +00:00
Zimuzo Ezeozue
3f2a7540e4 Merge "Fix FileUtils#copy to fallback on userspace copy if sendfile fails" into sc-dev 2021-04-12 14:33:32 +00:00
Matt Casey
53cf30dade Merge changes Ia9f0293a,I06bab02a into sc-dev 
* changes:
  Prevent CropView from getting confused by multiple pointers.
  TalkBack and switch access support for CropView
 2021-04-12 14:32:19 +00:00
Chiachang Wang
1de3108a3f Merge "Rename APIs in NetworkAgentConfig.Builder" am: a0445d3546 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1669047

Change-Id: Ia437814497ef603043980c37add9e2ddfccf11c9
 2021-04-12 14:25:01 +00:00
Chiachang Wang
a0445d3546 Merge "Rename APIs in NetworkAgentConfig.Builder" 2021-04-12 14:10:46 +00:00
Paul Hu
33986467a7 Merge "Remove TcpRepairWindow from module-lib API" am: b82fad9aa9 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1671788

Change-Id: Ie2f0463dd064ad7363054a5c08b6e09b54eea6cb
 2021-04-12 14:04:27 +00:00
Chavi Weingarten
a6d011d092 Merge "Revert^2 "Remove setFrame from surface_control setGeometry"" into sc-dev 2021-04-12 13:51:01 +00:00
Paul Hu
b82fad9aa9 Merge "Remove TcpRepairWindow from module-lib API" 2021-04-12 13:40:12 +00:00
Treehugger Robot
7529cef66e [automerger skipped] Merge "CEC: Implement handleReportArcInitiate method" am: b36f38b8aa am: e772a46831 am: 498c152534 -s ours 
am skip reason: skip tag Change-Id Ibdff6d2c83d945f487312a14b577ace0636d7b02 with SHA-1 527d7f0600 is already in history

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

Change-Id: I3a74d4494c0d50fbccbe0bdafb4ab6427b51a8c5
 2021-04-12 13:28:17 +00:00
Fabian Kozynski
b4f9164e5c Merge "Fix colors and themes in QS" into sc-dev 2021-04-12 13:04:39 +00:00
Eran Messeri
b056b2c7bc Merge "Rename Enterprise Network Preference to Preferential network service" into sc-dev 2021-04-12 13:02:25 +00:00
Zim
6502f59a98 Fix FileUtils#copy to fallback on userspace copy if sendfile fails 
As per the manpage, sendfile(2) might fail for the following reasons:
1. input fd doesn't support mmap
2. output was opened with O_APPEND

If sendfile(2) fails with EINVAL or ENOSYS, we fallback to userspace
copy

Fixed failing FileUtilsTest#convertToModernFd test since
I7d6ecf4549e8ed5134d20977c2089240be804827 that stoped matching valid
files to convert to modernfd with regex

Test: atest FileUtilsTest
Bug: 184236915
Change-Id: I0955fe2a7dfb40ac1f78bde4a325eb624a34f28b
 2021-04-12 12:52:47 +00:00
Treehugger Robot
498c152534 Merge "CEC: Implement handleReportArcInitiate method" am: b36f38b8aa am: e772a46831 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1589691

Change-Id: I611985ac9ca69ffa05801fe7170955076a720593
 2021-04-12 12:42:25 +00:00
Chalard Jean
fdeb85d4ae Merge changes Ic4500dc8,I32477db5 into sc-dev 
* changes:
  [NS12] Address comments on NS09
  [NS11] Fix yieldToBadWifi over the policy scoring
 2021-04-12 12:41:17 +00:00
Matt Pietal
4b6b1ea41a Merge "Update to latest UX margins for clock... and much more" into sc-dev 2021-04-12 12:35:55 +00:00
Neil Fuller
7f9caf4cd7 Merge "Move some tests into CTS to avoid duplication" into sc-dev 2021-04-12 12:29:26 +00:00
Michał Brzeziński
455fb0f183 Merge "Increasing top padding for notifications in split shade mode" into sc-dev 2021-04-12 12:18:58 +00:00
Michał Brzeziński
733c9568f8 Merge "Adding tests for dual tone shade in ScrimController" into sc-dev 2021-04-12 12:18:03 +00:00
Lucas Lin
00ae6df133 Merge "Replace hidden API with public API" into sc-dev 2021-04-12 12:15:00 +00:00
Treehugger Robot
e772a46831 Merge "CEC: Implement handleReportArcInitiate method" am: b36f38b8aa 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1589691

Change-Id: Ib98ea5394f46197c3ebe7960829e8ebf346ce87e
 2021-04-12 12:03:49 +00:00
Treehugger Robot
b36f38b8aa Merge "CEC: Implement handleReportArcInitiate method" 2021-04-12 11:08:22 +00:00
Matt Pietal
b41253b7da Update to latest UX margins for clock... and much more 
Remove old style clocks and all related code. Begin unraveling code
supporting multiple layouts. Migrate plugin small/big clock support to
the new clock areas.

Fixes: 184073275
Test: atest KeyguardClockSwitchTest KeyguardClockSwitchControllerTest
Change-Id: I38dc2a6df6a710c6da23cbb17fac8d28f3b84764
 2021-04-12 06:48:48 -04:00
Anton Hansson
d7440a1c68 Merge "Dist android-non-updatable.jar for sdk" am: e93771bfca am: 9ed545c4e7 am: 27fe7fa70e 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1671727

Change-Id: I619111352f5510e69b6074ffcf11b8234fa3cc87
 2021-04-12 10:39:12 +00:00
Anton Hansson
b63991e700 Merge "Compile android-non-updatable separately" am: e4d95a9e15 am: c26f163ad3 am: f2118995b2 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1671726

Change-Id: I7b36622e3355c1c8eb365813579958b8260c8c17
 2021-04-12 10:38:29 +00:00
Chalard Jean
5c10b79466 [NS12] Address comments on NS09 
Test: ConnectivityServiceTest
Fixes: 184507247
Change-Id: Ic4500dc85507fa68538c9ec179ec6eb4f44c5022
 2021-04-12 10:20:27 +00:00
Chalard Jean
04cd68a03e [NS11] Fix yieldToBadWifi over the policy scoring 
This doesn't reactivate the test because it's not yet fixed over int
scoring.

Bug: 184834350
Test: Remove @Ignore and run testAvoidBadWifi
Change-Id: I32477db52eb50faabc499fa68e24ba07577782aa
 2021-04-12 10:19:57 +00:00
Anton Hansson
27fe7fa70e Merge "Dist android-non-updatable.jar for sdk" am: e93771bfca am: 9ed545c4e7 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1671727

Change-Id: Iff0921640fe770fc2c58c29675d5ae50395415a7
 2021-04-12 10:14:17 +00:00
Anton Hansson
f2118995b2 Merge "Compile android-non-updatable separately" am: e4d95a9e15 am: c26f163ad3 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1671726

Change-Id: Iebca1291888f3f04f779d3abe4aaf049cde7856e
 2021-04-12 09:53:32 +00:00
Anton Hansson
9ed545c4e7 Merge "Dist android-non-updatable.jar for sdk" am: e93771bfca 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1671727

Change-Id: Id55afc826b3d874f125922dc651e3dde652b8ad8
 2021-04-12 09:52:58 +00:00
Anton Hansson
e93771bfca Merge "Dist android-non-updatable.jar for sdk" 2021-04-12 09:31:09 +00:00
Tony Huang
5ebb9672f2 Merge "Add callback of TaskStackChangeListener" into sc-dev 2021-04-12 09:29:32 +00:00
Chiachang Wang
e9f341c20f Rename APIs in NetworkAgentConfig.Builder 
As API review feedback, rename disableProvisioningNotification()
to setEnabledProvisioningNotification and disableNat64Detection()
to setEnabledNat64Detection. Also, update code in caller side
accordingly.

Bug: 184735772
Test: make update-api ; atest FrameworksNetTests
Change-Id: If7305634863d1503c967e5593ebd0c8af2174bea
 2021-04-12 17:27:47 +08:00
Anton Hansson
c26f163ad3 Merge "Compile android-non-updatable separately" am: e4d95a9e15 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1671726

Change-Id: I642a60c1ad265c645ea441ee0393e732622b3288
 2021-04-12 09:13:57 +00:00
TreeHugger Robot
5f331bb78a Merge "Add backward compatible for MainSwitchPreference" into sc-dev 2021-04-12 09:10:05 +00:00
Anton Hansson
e4d95a9e15 Merge "Compile android-non-updatable separately" 2021-04-12 08:30:18 +00:00
lucaslin
d569b783aa Replace hidden API with public API 
NetworkInfo will be a part of mainline module, so external callers
cannot call its hidden API. Use the public API instead.

Bug: 182859030
Test: 1. Remove "framework-connectivity.impl"
      2. make SettingsLibs
Change-Id: I671aaf5099f7cd3459588a78cb99de39a0e23f95
 2021-04-12 16:19:46 +08:00
Robert Horvath
179483548f Merge "On quiescent boot, report screenTurningOff, skip screenTurningOn" into sc-dev 2021-04-12 07:55:02 +00:00
Edgar Wang
43e006b69b Add backward compatible for MainSwitchPreference 
- Before Android S, it will apply SwitchBar layout
- Fix TypedArrayUtils can't build pass in another path.

Bug: 182179573
Test: robotest & manual
Change-Id: I33ca1991cef359f8e95650c7616bb76cee3bb7ff
 2021-04-12 07:42:37 +00:00
TreeHugger Robot
d5d2857c51 Merge "Tweak SettingsTheme" into sc-dev 2021-04-12 07:41:44 +00:00
Tiger Huang
ea3ff6f89b Merge "Only update insetsHint while necessary" into sc-dev 2021-04-12 07:07:32 +00:00
TreeHugger Robot
c7469537d9 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into stage-aosp-master am: d655d43041 -s ours am: 9e7226e4ef -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I3686bfa1df93c8011b45b5a4c8e054f3bc1b9080
 2021-04-12 06:41:57 +00:00
TreeHugger Robot
2054e9cd97 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into stage-aosp-master am: ebe037549b -s ours am: dcfe628abd -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I90a163297a564c2108a164b2b76447e40ad1948e
 2021-04-12 06:41:46 +00:00
TreeHugger Robot
76d1c45674 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into stage-aosp-master am: d07abac902 -s ours am: e0ded72ce8 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I3e4ca4d19214fff14a19d4b3346f23f53e244a3a
 2021-04-12 06:41:03 +00:00
TreeHugger Robot
fd9c6af47d [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into stage-aosp-master am: c97e512117 -s ours am: 30e7ed24cc -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ied97563973f212b04cfc123c1609e6cad4cff3eb
 2021-04-12 06:40:40 +00:00