Commit Graph

630859 Commits

Author SHA1 Message Date
Lucas Lin
1fe4cb3e5d Merge "Use getAllInterfaceNames to get all interface names" into sc-dev 2021-03-22 04:47:22 +00: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
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
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
Adam Bookatz
ee9e9b6f98 Merge "Move upgradeUserTypesLU code" into sc-dev 2021-03-20 01:08:09 +00:00
Sean Stout
dcdb236a6c Merge "Only create DPCs for LocalDisplays & FLAG_OWN_DISPLAY_GROUP" into sc-dev 2021-03-20 00:48:53 +00:00
TreeHugger Robot
864c714d77 Merge "Lazy load the allocation of Slog message formatting objects." into sc-dev 2021-03-20 00:29:12 +00:00
Tyler Gunn
5bb6b8ad57 Merge "Propagate call quality reports from Telephony to CallDiagnosticService." into sc-dev 2021-03-20 00:23:33 +00:00
Bill Yi
3fbd85f3af Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: Id531b21eafe9c42c8e461692ccb59883875b802e
2021-03-20 00:17:53 +00:00
TreeHugger Robot
9f15b8d17a Merge "Updates to API based on API council feedback." into sc-dev 2021-03-20 00:02:52 +00:00
Yurii Zubrytskyi
0583e7f5c9 [incfs] Allow multiple timed jobs at the same time point
Old code had a tiny chance of ignoring a job if it happens to
be scheduled to the exactly the same time as one already in the
queue. Not that it will ever happen, but better to fix it.

+ make the worker thread code slightly easier to reason about

Bug: 183243150
Test: atest IncrementalServiceTest
Change-Id: Ia3126d30e19edfd17f7c8da368e9763ca5501e84
2021-03-19 17:00:12 -07:00
Bob Badour
de3fb7e9b3 Merge "[LSC] Add LOCAL_LICENSE_KINDS to frameworks/base" into sc-dev 2021-03-19 23:55:24 +00:00
Jeff Sharkey
a57db58f24 Surface "neverForLocation" through public API.
Since developers can declare the "neverForLocation" flag in their
manifest as public API, we should also offer a way to inspect the
value that we parsed from the manifest.  We do this by surfacing it
through the existing PackageInfo.requestedPermissionsFlags field.

This also means we can remove the PackageManagerInternal API, since
interested parties can now check PackageInfo directly.

Fix a potential security issue by only accepting flags from manifest
when the application is targeting a modern enough SDK.

Bug: 181812281
Test: atest CtsContentTestCases:PackageManagerTest
Test: atest FrameworksServicesTests:PackageParserTest
Test: atest com.android.server.pm.parsing
Change-Id: I877768c06ee15281f3334794034f4af563e74569
2021-03-19 17:51:16 -06:00
TreeHugger Robot
0b6d627ebe Merge "Update DOMAIN_VERIFICATION_AGENT to internal|privileged" into sc-dev 2021-03-19 23:45:22 +00:00
Nikita Dubrovsky
1b2051e372 Merge "Integrate OnReceiveContentListener in View.onDragEvent" into sc-dev 2021-03-19 23:43:26 +00:00
Matt Casey
6e67c50402 Merge "Layout and style updates for LongScreenshotActivity" into sc-dev 2021-03-19 23:36:09 +00:00
Shivam Agrawal
95f98799f8 Ensure Display Settings Overrides Do Not Impact TestDisplayContent
Display overrides such as width, height, and density
should not override values set in TestDisplayContent.
Otherwise, test conditions are not consistent and can
lead to test failures on some devices.

To prevent this, set the uniqueId of the DisplayInfo
of the TestDisplayContent to a value different from
that of the actual device displays. This ensures that
DisplayWindowSettingsProvider does not apply override
settings by comparing against uniqueId.

Bug: b/182499175
Test: atest DisplayContentTests
Change-Id: I0ad10c2b3dc30849373a938bfd06533731f1a6dc
2021-03-19 19:20:31 -04:00
Galia Peycheva
c3f3255c38 Merge "Add shell control for disabling blur" into sc-dev 2021-03-19 23:13:38 +00:00
Treehugger Robot
5fb05e5201 Merge changes from topic "bluetooth_oob_api" am: 55fe87b2f6 am: 9f8fd40407 am: 1a71a8825b
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1640633

Change-Id: Ia809b070bc1eda0fdbf4701f626fa5bbb11b42e8
2021-03-19 22:51:26 +00:00
Martin Brabham
e1985289e8 [automerger skipped] Bluetooth: Modify and append to the Out-of-Band API am: 96e6e4a0b3 am: b4f9ff1810 am: a4d053d2e1 -s ours
am skip reason: skip tag Change-Id I46aec8c2cb64a8da8957d01d32b879d60df7a31c with SHA-1 6ab241ca6a is already in history

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

Change-Id: Ib8280af19016fa6afe23bde713fb1c51e9e1b02d
2021-03-19 22:51:00 +00:00
Christian Wailes
cbc2ac29ee Merge "Update OWNERS file" am: d6c3dfb3ff am: 4f5e3b92f7 am: f1eb6c7bf4
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1640627

Change-Id: I011e62c84151f46fbf4223cd52d11f2edb3d6c30
2021-03-19 22:50:29 +00:00
Lucas Dupin
ed182a33e1 Merge "UX feedback for ripple" into sc-dev 2021-03-19 22:49:50 +00:00