Commit Graph

630898 Commits

Author SHA1 Message Date
Peter Collingbourne
2e6fd97092 Merge "Support MTE and GWP-ASan features in proto tombstones." am: efad4dcd74 am: 1f58a4bf12 am: f26d63feb3
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1625208

Change-Id: If1ff31554c8651b964acf28d54c7334d333e6f99
2021-03-22 10:54:45 +00:00
Josh Gao
1c6dd547b5 Merge "Switch to bionic's pidfd_open." am: 680aaa9195 am: 95445c287c am: bc82f0c678
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1646356

Change-Id: I357c24ce5ba57d7887dce9e7f58d0e924e59ce85
2021-03-22 10:54:02 +00:00
Tej Singh
b3db256be1 [automerger skipped] Merge changes from topic "tej_isolate_protologging" am: d5127dceb0 am: 975acea8a5 am: 806baa23ba -s ours
am skip reason: skip tag Change-Id I24ff96806e417ad4ee89d84f051ea790a416338f with SHA-1 e5cffdb857 is already in history

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

Change-Id: Ibaab71602ed90389843202b05fa5d903aee6745d
2021-03-22 10:53:30 +00:00
Tej Singh
3033e82164 [automerger skipped] Move service/enums.proto to proto_logging am: 91bceaae7a am: 4235756ab9 am: a06eac39b6 -s ours
am skip reason: skip tag Change-Id I9ea0a1482336694c446e950ea5cb46b95372b76d with SHA-1 51cffe5260 is already in history

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

Change-Id: I43c3f660a3030f5edfe268792510abc8ebc38a18
2021-03-22 10:53:20 +00:00
Tej Singh
fb57096d12 [automerger skipped] Add usb and networkcapabilities back to core/proto am: 185bb90134 am: 6d2b61df0d am: 8d152af2b9 -s ours
am skip reason: skip tag Change-Id I055a3ca44b83921018697bdefec29161b483d0fe with SHA-1 d825d18431 is already in history

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

Change-Id: I481972bb025749863d9585e0a83a17abaf135047
2021-03-22 10:53:10 +00:00
Ming-Shin Lu
39217229c8 Merge "Fix NavigationBar overlapping with the IME window" into sc-dev 2021-03-22 10:22:36 +00:00
Oli Lan
168fa576a5 Merge "Add clipboard CTS tests to presubmit test mapping for ClipboardService." into sc-dev 2021-03-22 10:19:29 +00:00
Lucas Lin
385414ee28 Merge "Remove the usage of NETID_UNSET from Vpn.java" into sc-dev 2021-03-22 09:38:26 +00:00
Remi NGUYEN VAN
15615ed0f2 Merge "Add NetworkFactory to connectivity jarjar rules" into sc-dev 2021-03-22 09:27:06 +00:00
Adrian Roos
07f3583061 Merge "IME Insets: Remove obsolete applyImeVisibility call" into sc-dev 2021-03-22 08:38:04 +00:00
lucaslin
2cc371c74b Remove the usage of NETID_UNSET from Vpn.java
Modify Vpn#getNetId() to Vpn#getNetwork() and uses NETID_UNSET
when getNetwork() returns null in ConnectivityServiceTest.

Bug: 182963397
Test: atest FrameworksNetTests
Change-Id: I69d449705b1dc541287c72af8dc7705dc4733109
2021-03-22 08:29:18 +00:00
TreeHugger Robot
0467858710 Merge "Animations for visual immersive mode" into sc-dev 2021-03-22 07:45:57 +00:00
TreeHugger Robot
f1ce6c68c9 Merge "Validate HotwordDetectionService to be in the isolated process." into sc-dev 2021-03-22 07:03:44 +00:00
Lucas Lin
22ca359895 Merge "Expose some APIs from ConnectivityManager" into sc-dev 2021-03-22 06:44:49 +00:00
Lucas Lin
1fe4cb3e5d Merge "Use getAllInterfaceNames to get all interface names" into sc-dev 2021-03-22 04:47:22 +00:00
Tiger Huang
7901e98c45 Animations for visual immersive mode
The CL applies fade-in/fade-out animations for BEHAVIOR_DEFAULT while
changing the system bar visibility.

Fix: 168913586
Test: WindowInsetsTests
Change-Id: I6e9887baf2ba40b51c01bf2239915d381ba891a6
2021-03-22 12:21:48 +08:00
lucaslin
02ec9e9d4a Remove the usage of hidden API - setIsAvailable() from Vpn
In fact, NetworkAgent#getLegacyNetworkInfo() will call this API,
so VPN doesn't need to call it.
Remove the redundant behavior and the usage of hidden API.

Bug: 182963397
Test: m
Change-Id: I3b88f22fffde3dd4000d28342ed07209c7121a37
2021-03-22 03:54:00 +00:00
lucaslin
9eae065a2e Expose some APIs from ConnectivityManager
- Expose setRequireVpnForUids to Vpn.java
- Expose setLegacyLockdownVpnEnabled to LockdownVpnTracker.java
- Expose requestRouteToHostAddress to
  GnssNetworkConnectivityHandler.java

Bug: 182963397
Test: m
Change-Id: I1fb5ecfbe37878ba3534e6c6c7599ca29db2735c
2021-03-22 11:51:27 +08:00
Remi NGUYEN VAN
1fa5fc98f7 Add NetworkFactory to connectivity jarjar rules
NetworkFactory is part of net-utils-device-common, but is outside of
the com.android.net.module.util and needs a separate jarjar rule.

Bug: 171540887
Test: atest FrameworksNetTests
Change-Id: Iec828a789175acdbe4e7f35e4cc942922540495c
2021-03-22 03:50:15 +00:00
Chiachang Wang
a95de94fd4 Merge "Remove hidden onAvailable callback override" into sc-dev 2021-03-22 02:44:16 +00:00
Lorenzo Colitti
9997912ba9 Merge "Use connectivity resources in service-connectivity" into sc-dev 2021-03-22 02:21:13 +00:00
Julia Reynolds
b7eee43f50 Merge "Provide more specific notification cancelation reasons" into sc-dev 2021-03-22 02:08:10 +00:00
Shubang Lu
f505c5d215 Merge "Unhide media metrics APIs" into sc-dev 2021-03-22 01:27:07 +00:00
Remi NGUYEN VAN
906cde3fde Merge "Use jniThrowErrnoException from JNIHelp" into sc-dev 2021-03-22 00:20:36 +00:00
Roshan Pius
1d050e01e0 Merge "resolve merge conflicts of 403b7fd0b0 to stage-aosp-master" into sc-dev 2021-03-21 23:41:31 +00:00
Roshan Pius
819ee3fe2d Merge "NetworkControllerWifiTest: Fix unit test" into sc-dev 2021-03-21 23:41:31 +00:00
TreeHugger Robot
41ec7a8e38 Merge "Add device config parameters to DiscreteRegistry." into sc-dev 2021-03-21 22:56:05 +00:00
Stanislav Zholnin
3c46aca490 Add device config parameters to DiscreteRegistry.
DiscreteRegistry cut off and quantization can be set using
adb shell device_config command.

Bug: 176965672
Test: in development
Change-Id: If4df5413d7c7f9bcbdcb751ac2ab772d51c1da80
2021-03-21 21:18:23 +00:00
Roshan Pius
00617edb46 resolve merge conflicts of 403b7fd0b0 to stage-aosp-master
Change-Id: Ib9d7923104ac0a60f6af5a3a2d2b7f13bc0262e3
2021-03-21 19:16:33 +00:00
Roshan Pius
2322c835cb NetworkControllerWifiTest: Fix unit test
WifiInfo.makeCopy(boolean) was changed to WifiInfo.makeCopy(long).

Bug: 156867433
Bug: 162602799
Test: Compiles
Change-Id: Idec6165f6cf9819c56513a65c6958f2390cddbfe
2021-03-21 17:56:42 +00:00
Hongbo Zeng
80e8713490 Merge "Support getSlicingConfig() API for 5G Slicing Configuration" into sc-dev 2021-03-21 10:55:07 +00:00
Adam He
2e43f72bf1 Merge "Implement TranslationCallback with support for partial responses." into sc-dev 2021-03-21 09:45:33 +00:00
Shivam Agrawal
19d042f7b9 Merge "Ensure Display Settings Overrides Do Not Impact TestDisplayContent" into sc-dev 2021-03-20 23:49:24 +00:00
Chris Li
67b5d6f6f8 Merge "Sandboxing for non-resizable in multiwindow" into sc-dev 2021-03-20 20:29:06 +00:00
TreeHugger Robot
e2a4f53119 Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev 2021-03-20 17:34:58 +00:00
TreeHugger Robot
563df99655 Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev 2021-03-20 17:34:08 +00:00
TreeHugger Robot
0748fe2254 Merge "Ignore the documentLaunchMode in testing" into sc-dev 2021-03-20 17:07:59 +00:00
Remi NGUYEN VAN
6211f92cc6 Use connectivity resources in service-connectivity
Migrate resource usage to the connectivity resource package.
For framework resources that have known overlays, keep a fallback until
the overlays can be migrated.

Bug: 182125649
Test: atest FrameworksNetTests
Change-Id: I778d94a5aac0c4e20e78b1ba3a002495c17a38a0
2021-03-21 01:39:51 +09:00
Oli Lan
9e565b40a4 Add clipboard CTS tests to presubmit test mapping for ClipboardService.
Bug: 179667029
Test: check presubmit on this CL
Change-Id: I1091276d0aa9afe32fe7fddc4cced092ca4a290c
2021-03-20 15:59:56 +00:00
Ruslan Tkhakokhov
e05824f661 Merge "Update BackupEligibilityRules" into sc-dev 2021-03-20 14:28:12 +00:00
Bill Yi
72ce1491e2 Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: I50082aa0a66f1fdbcd1bc731892ec6111cd8e6b1
2021-03-20 13:24:30 +00:00
Bill Yi
f8af11cd01 Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: Ibfe948ac82b41c118fde8f31bb1343d8d716e1b7
2021-03-20 05:08:47 +00:00
TreeHugger Robot
5f573843ca Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev 2021-03-20 04:31:23 +00:00
Darryl Johnson
30cefedcdb Merge changes from topic "jumbo-sidecar-posture" into sc-dev
* changes:
  Update sample Sidecar/Extension implementation to allow mapping system device state to posture via a config.
  Seperate SettingsConfigProvider into producers.
2021-03-20 03:44:01 +00:00
Jeff Sharkey
7be2cf8c4b Merge "Surface "neverForLocation" through public API." into sc-dev 2021-03-20 03:01:08 +00:00
Jeff DeCew
7d1ca13d41 Merge "Minimal change to remove development settings." into sc-dev 2021-03-20 02:34:24 +00:00
TreeHugger Robot
6f668bf61c Merge "Change the spring constants for EdgeEffect" into sc-dev 2021-03-20 02:08:27 +00:00
Julia Reynolds
972df6e950 Provide more specific notification cancelation reasons
For S+ apps

Test: CTS
Fixes: 175319604
Change-Id: I836b6632007224381a181add54e3c36a39466d4b
Merged-In: I836b6632007224381a181add54e3c36a39466d4b
2021-03-20 02:05:06 +00:00
TreeHugger Robot
99d36e3e28 Merge "[incfs] Allow multiple timed jobs at the same time point" into sc-dev 2021-03-20 01:42:19 +00:00
shubang
be0b58d62a Unhide media metrics APIs
1. playbackId class
2. metrics bundle for future backwards compatibility
3. new enums and fields

Bug: 167036690
Test: atest android.media.metrics.cts
Change-Id: I09889dfd247017ee43fb833d9df98420dccf54a6
2021-03-19 18:34:47 -07:00