Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
637,944 Commits 3 Branches 0 Tags
50a637b1e52f0fb6728eb112c51494de55879e44
Commit Graph

11213 Commits

Author SHA1 Message Date
Treehugger Robot
fa48e29267 Merge "[LSC] Add LOCAL_LICENSE_KINDS to frameworks/base" am: e7a1ee828d am: 2c363d2dd9 am: b3527b07f1 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1686987

Change-Id: I6b75be9fdb78c43a1f6732b1f5c6737da16da432
 2021-04-26 22:56:18 +00:00
Bob Badour
6b3ffd27ab [LSC] Add LOCAL_LICENSE_KINDS to frameworks/base 
Added SPDX-license-identifier-Apache-2.0 to:
  location/tests/Android.bp
  services/tests/servicestests/test-apps/PackageParsingTestManifests/Android.bp
  tests/DynamicCodeLoggerIntegrationTests/Android.mk
  tests/FlickerTests/test-apps/Android.bp

Bug: 68860345
Bug: 151177513
Bug: 151953481

Test: m all

Exempt-From-Owner-Approval: janitorial work
Change-Id: If81cb09cb5da063fe7cc00a70d46ce6d4ce5b10e
 2021-04-26 12:42:45 -07:00
Brian Osman
64ee324b93 Update frameworks/base to use newer SkRuntimeEffect::MakeForShader 
This enforces stricter rules on the SkSL at effect creation time, and
ensures it's valid as an SkShader (vs. an SkColorFilter). Also updated
some SkSL that was already (or would become) illegal:

- Child shaders must be declared 'uniform', not 'in'
- sampling a child requires coordinates

Bug: skia:11813
Change-Id: I743b985b5012723186a43e58e9e3ccf29d809d2b
(cherry picked from commit 7556777511)
 2021-04-26 18:31:36 +00:00
James Mattis
bc4ca04caa Merge "Changing per-app default request to TRACK_DEFAULT" 2021-04-26 14:39:44 +00:00
Chiachang Wang
13e89b75d3 Merge "Address API review feedback" 2021-04-26 00:22:27 +00:00
Treehugger Robot
05e6dd50ab Merge "[LSC] Add LOCAL_LICENSE_KINDS to frameworks/base" am: aa21d775a0 am: 58a6b364fa am: 1cacb3d497 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1685885

Change-Id: Ief2d184284fcb1640776ff1da11ee34fc25bad73
 2021-04-24 01:58:02 +00:00
Bob Badour
6a66a0714c [LSC] Add LOCAL_LICENSE_KINDS to frameworks/base 
Added SPDX-license-identifier-Apache-2.0 to:
  location/tests/Android.bp
  services/tests/servicestests/test-apps/PackageParsingTestManifests/Android.bp
  tests/FlickerTests/test-apps/Android.bp
  tests/backup/Android.mk

Bug: 68860345
Bug: 151177513
Bug: 151953481

Test: m all

Exempt-From-Owner-Approval: janitorial work
Change-Id: Ie3a7632b6f46a8a104bfdf52ab77fb7ffefbdd7c
 2021-04-23 16:13:27 -07:00
James Mattis
572ab83446 Changing per-app default request to TRACK_DEFAULT 
Changing the per-app default request flows to fallback to a request of
type TRACK_DEFAULT as opposed to type REQUEST. The main benefit of this
change is that these requests will no longer be sent to the factories
which is desired.

Bug: 180452284
Bug: 176494815
Test: atest FrameworksNetTests
atest FrameworksNetIntegrationTests
atest CtsNetTestCasesLatestSdk

Change-Id: I312e55a54f70aa82953a32ab9369d5afc02b75e5
Merged-In: I312e55a54f70aa82953a32ab9369d5afc02b75e5
 2021-04-23 07:47:11 -07:00
James Mattis
320acb1204 Merge changes I5125755b,I312e55a5 into sc-dev 
* changes:
  Updating tests to honor per-app TRACK_DEFAULT
  Changing per-app default request to TRACK_DEFAULT
 2021-04-23 14:42:51 +00:00
Remi NGUYEN VAN
efcd27a0dc Merge "Use connectivity resources in service-connectivity" 2021-04-23 05:42:13 +00:00
Chiachang Wang
a424d5bafc Address API review feedback 
Address API review feedback to:
 - Rename NetworkAgent#setTeardownDelayMs to
   NetworkAgent#setTeardownDelayMillis
 - Use getters instead of fields in VpnTransportInfo
 - Rename registerDefaultNetworkCallbackAsUid to
   registerDefaultNetworkCallbackForUid in ConnectiivityManager

Bug: 183972850
Bug: 185246410
Fix: 184735863
Test: make update-api
Test: atest FrameworksNetTests
Test: atest CtsNetTestCasesLatestSdk
Change-Id: I5e8c4bed8bda40d507afa894c359b5e24ee5d868
Merged-In: I5e8c4bed8bda40d507afa894c359b5e24ee5d868
 2021-04-23 02:46:05 +00:00
TreeHugger Robot
7ebc50ac8c Merge "Disable flaky flicker tests" into sc-dev 2021-04-23 02:38:16 +00:00
Remi NGUYEN VAN
2ecc79d616 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
Merged-In: I778d94a5aac0c4e20e78b1ba3a002495c17a38a0
(clean cherry-pick)

Change-Id: I778d94a5aac0c4e20e78b1ba3a002495c17a38a0
 2021-04-23 10:36:15 +09:00
James Mattis
261c975e3d Updating tests to honor per-app TRACK_DEFAULT 
Per-app APIs in ConnectivityService will now have their fallback
request which tracks the system default be of type TRACK_DEFAULT
as opposed to REQUEST. Existing tests which expect this fallback request
to be sent to network factories need to be updated to validate this
change.

Bug: 180452284
Bug: 176494815
Test: atest FrameworksNetTests
Change-Id: I5125755b3ed1ec535494e2d7a48c0860710ed056
 2021-04-22 17:41:47 -07:00
Chiachang Wang
f66c5cba89 Merge "Address API review feedback" into sc-dev 2021-04-23 00:30:51 +00:00
Hui Yu
9757955874 Merge "Temp allowlist bluetooth broadcast to start FGS for 10 seconds." into sc-dev 2021-04-22 23:41:30 +00:00
Bob Badour
0fd3637f6e Merge "[LSC] Add LOCAL_LICENSE_KINDS to frameworks/base" into sc-dev 2021-04-22 23:23:16 +00:00
Nataniel Borges
91b6830e38 Disable flaky flicker tests 
Some tests are still flaky and affecting presubmit

Bug: 185400889
Bug: 186119282
Bug: 186115871
Test: atest FlickerTests WMShellFlickerTests
Change-Id: Ie4e21d01d5ea7586f88470543321ce26ed74afa6
 2021-04-22 19:10:04 +02:00
Remi NGUYEN VAN
a3c2e8478b Merge "Add QUERY_ALL_PACKAGES to net integration tests" am: 89cd3d59c0 am: ee5ce73895 am: 31921eb09c 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1684407

Change-Id: I3b8b82e07e1e731e95759b42ee35da3f67f2dded
 2021-04-22 15:54:43 +00:00
Remi NGUYEN VAN
89cd3d59c0 Merge "Add QUERY_ALL_PACKAGES to net integration tests" 2021-04-22 14:38:40 +00:00
James Mattis
8d64dfc836 Changing per-app default request to TRACK_DEFAULT 
Changing the per-app default request flows to fallback to a request of
type TRACK_DEFAULT as opposed to type REQUEST. The main benefit of this
change is that these requests will no longer be sent to the factories
which is desired.

Bug: 180452284
Bug: 176494815
Test: atest FrameworksNetTests
atest FrameworksNetIntegrationTests
atest CtsNetTestCasesLatestSdk

Change-Id: I312e55a54f70aa82953a32ab9369d5afc02b75e5
 2021-04-22 07:26:10 -07:00
Chalard Jean
7db2c51ca5 Merge "Enable policy ranking" into sc-dev 2021-04-22 13:24:32 +00:00
Remi NGUYEN VAN
c78125940a Add QUERY_ALL_PACKAGES to net integration tests 
The permission is necessary for ConnectivityService to obtain its
resource package. As the integration tests run ConnectivityService
in-process, they need the permission.

Bug: 186091860
Test: atest FrameworksNetIntegrationTests
Change-Id: I60cf9b54faddf0ea4cb02146c83c9bba58370749
 2021-04-22 22:02:01 +09:00
Yan Yan
fcadf51f2c Merge changes from topics "encrypted-tunnel-interface", "iketunnelparams", "vcn-encrypted-tunnel" am: bc545c8a8a am: 7a52d5a3eb am: 1df96ea6ac 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1652997

Change-Id: If056d1a90cc4dce3882168ca23302fcd086b40ae
 2021-04-22 10:08:28 +00:00
Yan Yan
55b1e5fbf5 Convert TunnelConnectionParams to/from PersistableBundle am: c0b7c4fa5a am: e80e82bb67 am: 7a961913b2 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1653048

Change-Id: Idbd09b9f8a7143e586b23db47bcffcd0b82ea0c0
 2021-04-22 10:08:15 +00:00
Remi NGUYEN VAN
b473ff1590 Merge "Fix netId testing on Q and R" into sc-dev 2021-04-22 09:56:52 +00:00
Yan Yan
e80e82bb67 Convert TunnelConnectionParams to/from PersistableBundle am: c0b7c4fa5a 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1653048

Change-Id: I71e0b9735af25bb3d2f8de17df1dac3df0e10106
 2021-04-22 09:16:46 +00:00
Yan Yan
bc545c8a8a Merge changes from topics "encrypted-tunnel-interface", "iketunnelparams", "vcn-encrypted-tunnel" 
* changes:
  Replace VcnControlPlaneConfig with TunnelConnectionParams
  Convert TunnelConnectionParams to/from PersistableBundle
  Create TunnelConnectionParams interface
 2021-04-22 08:39:20 +00:00
Yan Yan
4eaa894d84 Replace VcnControlPlaneConfig with TunnelConnectionParams 
Use the more generic object TunnelConnectionParams in VCN.
TunnelConnectionParams may also be used in VPN in the future.

Test: atest FrameworksVcnTests
Bug: 180664474
Change-Id: Ie433f9df614e1f51cdff200d915b68b61e5ca35e
 2021-04-21 22:52:22 -07:00
Yan Yan
c0b7c4fa5a Convert TunnelConnectionParams to/from PersistableBundle 
Add utility class to convert TunnelConnectionParams to and from
PersistableBundle.

Bug: 180664474
Test: atest EncryptedTunnelParamsUtilsTest
Change-Id: I93ae068eb6d1e1c4d3fcbaccbaae867db8d07a38
 2021-04-21 22:49:47 -07:00
Remi NGUYEN VAN
d1f850d369 Fix netId testing on Q and R 
Do not call getNetId() on Q as it did not exist yet. Add a separate test
for getNetId(), only run after Q.

Also add testing for getNetIdForResolv and fromNetworkHandle on Q and R.

Bug: 185731396
Test: atest NetworkTest
Change-Id: I03f9eb0c94b09dc285018e9887fe20d95a93ae45
 2021-04-22 14:38:51 +09:00
Treehugger Robot
a2da3ebb16 Merge "[VCN19] Rename get/setSubIds to get/setSubscriptionIds" 2021-04-22 04:43:26 +00:00
Kohsuke Yatoh
62e854c466 Merge "Do not actually reboot the device in VTS test." into sc-dev 2021-04-22 03:59:40 +00:00
Aaron Huang
0924e0d9d6 Merge "Add getters to UnderlyingNetworkInfo" into sc-dev 2021-04-22 03:09:41 +00:00
Benedict Wong
fbc23c6adb Merge changes I64b56575,I40553a7b am: 80afe1eeee am: f595e45401 am: 0b3c038764 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1682062

Change-Id: I50cb828d54b8f7669c33945c7cef8a366c7c316c
 2021-04-22 02:50:04 +00:00
Benedict Wong
80afe1eeee Merge changes I64b56575,I40553a7b 
* changes:
  Expose API for retrieval of subscription groups with VCN configured
  Add support for retrieval of configured VCNs by carrier privilege
 2021-04-22 01:31:11 +00:00
Kohsuke Yatoh
679a824773 Do not actually reboot the device in VTS test. 
- Sometimes reboot takes longer time and makes following tests fail.
- If the device has a screen lock, tests get stuck there.

This is not a new issue, but a recently added test (#launchApp) tries
to start an Activity and it fails when the device is still booting or at
a screen lock.

Bug: 185483743
Bug: 185576411
Test: atest FrameworksServicesTests:UpdatableFontDirTest
Test: atest UpdatableSystemFontTest
Change-Id: I86d4be1761e648114503b5f3560992a89c0b34d7
 2021-04-22 00:23:28 +00:00
Hui Yu
8c23d658c7 Temp allowlist bluetooth broadcast to start FGS for 10 seconds. 
Add an overloaded version of Context.sendBroadcastMultiplePermissions() that can
specify BroadcastOptions, it is called by com.android.bluetooth package.

Bug: 182816627
Test: atest AdapterServiceTest
Test: atest AvrcpControllerStateMachineTest
Test: atest BondStateMachineTest
Test: atest MapClientStateMachineTest
Test: atest RemoteDevicesTest

Change-Id: I8bb2d2ed98ece70ebbe9d3a1b549b966d690de4f
 2021-04-21 16:48:04 -07:00
Kohsuke Yatoh
dcb3fd9182 Merge "Wait more time for activity start." into sc-dev 2021-04-21 22:51:58 +00:00
Treehugger Robot
0cfaf8aa1c Merge "DO NOT MERGE Add LOCAL_LICENSE_KINDS to frameworks/base" 2021-04-21 21:58:38 +00:00
Bob Badour
1cdaca9f84 [LSC] Add LOCAL_LICENSE_KINDS to frameworks/base 
Added SPDX-license-identifier-Apache-2.0 to:
  core/tests/hosttests/test-apps/DownloadManagerTestApp/Android.mk
  core/tests/hosttests/test-apps/MultiDexLegacyAndException/Android.mk
  core/tests/hosttests/test-apps/MultiDexLegacyTestApp/Android.mk
  core/tests/hosttests/test-apps/MultiDexLegacyTestAppTests/Android.mk
  core/tests/hosttests/test-apps/MultiDexLegacyTestAppTests2/Android.mk
  core/tests/hosttests/test-apps/MultiDexLegacyTestAppWithCorruptedDex/Android.mk
  core/tests/hosttests/test-apps/MultiDexLegacyTestServices/Android.mk
  core/tests/hosttests/test-apps/MultiDexLegacyTestServicesTests2/Android.mk
  core/tests/hosttests/test-apps/MultiDexLegacyVersionedTestApp_v1/Android.mk
  core/tests/hosttests/test-apps/MultiDexLegacyVersionedTestApp_v2/Android.mk
  core/tests/hosttests/test-apps/MultiDexLegacyVersionedTestApp_v3/Android.mk
  core/tests/overlaytests/host/test-apps/SignatureOverlay/Android.mk
  core/tests/overlaytests/host/test-apps/UpdateOverlay/Android.mk
  packages/Android.bp
  packages/SystemUI/tests/Android.mk
  services/tests/servicestests/test-apps/PackageParsingTestManifests/Android.bp
  tests/Camera2Tests/CameraToo/Android.mk
  tests/Camera2Tests/CameraToo/tests/Android.mk
  tests/Camera2Tests/SmartCamera/SimpleCamera/Android.mk
  tests/Camera2Tests/SmartCamera/SimpleCamera/tests/Android.mk
  tests/CanvasCompare/Android.mk
  tests/FlickerTests/test-apps/Android.bp
  tests/LockTaskTests/Android.mk
  tests/SoundTriggerTests/Android.mk
  tools/aapt2/integration-tests/MergeOnlyTest/App/Android.mk
  tools/aapt2/integration-tests/NamespaceTest/App/Android.mk
  tools/aapt2/integration-tests/NamespaceTest/Split/Android.mk
  tools/fonts/Android.bp

Bug: 68860345
Bug: 151177513
Bug: 151953481

Test: m all

Exempt-From-Owner-Approval: janitorial work
Change-Id: Ic480b653df5da840f5e65b818af3de5c8417ab4a
 2021-04-21 14:42:18 -07:00
Bob Badour
268090cd09 DO NOT MERGE Add LOCAL_LICENSE_KINDS to frameworks/base 
Added SPDX-license-identifier-Apache-2.0 to:
  core/tests/hosttests/test-apps/DownloadManagerTestApp/Android.mk
  core/tests/hosttests/test-apps/MultiDexLegacyAndException/Android.mk
  core/tests/hosttests/test-apps/MultiDexLegacyTestApp/Android.mk
  core/tests/hosttests/test-apps/MultiDexLegacyTestAppTests/Android.mk
  core/tests/hosttests/test-apps/MultiDexLegacyTestAppTests2/Android.mk
  core/tests/hosttests/test-apps/MultiDexLegacyTestAppWithCorruptedDex/Android.mk
  core/tests/hosttests/test-apps/MultiDexLegacyTestServices/Android.mk
  core/tests/hosttests/test-apps/MultiDexLegacyTestServicesTests2/Android.mk
  core/tests/hosttests/test-apps/MultiDexLegacyVersionedTestApp_v1/Android.mk
  core/tests/hosttests/test-apps/MultiDexLegacyVersionedTestApp_v2/Android.mk
  core/tests/hosttests/test-apps/MultiDexLegacyVersionedTestApp_v3/Android.mk
  core/tests/overlaytests/host/test-apps/SignatureOverlay/Android.mk
  core/tests/overlaytests/host/test-apps/UpdateOverlay/Android.mk
  location/tests/Android.bp
  packages/CarSystemUI/tests/Android.mk
  packages/SystemUI/tests/Android.mk
  packages/overlays/AccentColorAmethystOverlay/Android.mk
  packages/overlays/AccentColorAquamarineOverlay/Android.mk
  packages/overlays/AccentColorBlackOverlay/Android.mk
  packages/overlays/AccentColorCarbonOverlay/Android.mk
  packages/overlays/AccentColorCinnamonOverlay/Android.mk
  packages/overlays/AccentColorGreenOverlay/Android.mk
  packages/overlays/AccentColorOceanOverlay/Android.mk
  packages/overlays/AccentColorOrchidOverlay/Android.mk
  packages/overlays/AccentColorPaletteOverlay/Android.mk
  packages/overlays/AccentColorPurpleOverlay/Android.mk
  packages/overlays/AccentColorSandOverlay/Android.mk
  packages/overlays/AccentColorSpaceOverlay/Android.mk
  packages/overlays/AccentColorTangerineOverlay/Android.mk
  packages/overlays/DisplayCutoutEmulationCornerOverlay/Android.mk
  packages/overlays/DisplayCutoutEmulationDoubleOverlay/Android.mk
  packages/overlays/DisplayCutoutEmulationHoleOverlay/Android.mk
  packages/overlays/DisplayCutoutEmulationNarrowOverlay/Android.mk
  packages/overlays/DisplayCutoutEmulationTallOverlay/Android.mk
  packages/overlays/DisplayCutoutEmulationWaterfallOverlay/Android.mk
  packages/overlays/DisplayCutoutEmulationWideOverlay/Android.mk
  packages/overlays/FontNotoSerifSourceOverlay/Android.mk
  packages/overlays/IconPackCircularAndroidOverlay/Android.mk
  packages/overlays/IconPackCircularLauncherOverlay/Android.mk
  packages/overlays/IconPackCircularSettingsOverlay/Android.mk
  packages/overlays/IconPackCircularSystemUIOverlay/Android.mk
  packages/overlays/IconPackCircularThemePickerOverlay/Android.mk
  packages/overlays/IconPackFilledAndroidOverlay/Android.mk
  packages/overlays/IconPackFilledLauncherOverlay/Android.mk
  packages/overlays/IconPackFilledSettingsOverlay/Android.mk
  packages/overlays/IconPackFilledSystemUIOverlay/Android.mk
  packages/overlays/IconPackFilledThemePickerOverlay/Android.mk
  packages/overlays/IconPackKaiAndroidOverlay/Android.mk
  packages/overlays/IconPackKaiLauncherOverlay/Android.mk
  packages/overlays/IconPackKaiSettingsOverlay/Android.mk
  packages/overlays/IconPackKaiSystemUIOverlay/Android.mk
  packages/overlays/IconPackKaiThemePickerOverlay/Android.mk
  packages/overlays/IconPackRoundedAndroidOverlay/Android.mk
  packages/overlays/IconPackRoundedLauncherOverlay/Android.mk
  packages/overlays/IconPackRoundedSettingsOverlay/Android.mk
  packages/overlays/IconPackRoundedSystemUIOverlay/Android.mk
  packages/overlays/IconPackRoundedThemePickerOverlay/Android.mk
  packages/overlays/IconPackSamAndroidOverlay/Android.mk
  packages/overlays/IconPackSamLauncherOverlay/Android.mk
  packages/overlays/IconPackSamSettingsOverlay/Android.mk
  packages/overlays/IconPackSamSystemUIOverlay/Android.mk
  packages/overlays/IconPackSamThemePickerOverlay/Android.mk
  packages/overlays/IconPackVictorAndroidOverlay/Android.mk
  packages/overlays/IconPackVictorLauncherOverlay/Android.mk
  packages/overlays/IconPackVictorSettingsOverlay/Android.mk
  packages/overlays/IconPackVictorSystemUIOverlay/Android.mk
  packages/overlays/IconPackVictorThemePickerOverlay/Android.mk
  packages/overlays/IconShapeHeartOverlay/Android.mk
  packages/overlays/IconShapePebbleOverlay/Android.mk
  packages/overlays/IconShapeRoundedRectOverlay/Android.mk
  packages/overlays/IconShapeSquareOverlay/Android.mk
  packages/overlays/IconShapeSquircleOverlay/Android.mk
  packages/overlays/IconShapeTaperedRectOverlay/Android.mk
  packages/overlays/IconShapeTeardropOverlay/Android.mk
  packages/overlays/IconShapeVesselOverlay/Android.mk
  packages/overlays/NavigationBarMode2ButtonOverlay/Android.mk
  packages/overlays/NavigationBarMode3ButtonOverlay/Android.mk
  packages/overlays/NavigationBarModeGesturalOverlay/Android.mk
  packages/overlays/NavigationBarModeGesturalOverlayExtraWideBack/Android.mk
  packages/overlays/NavigationBarModeGesturalOverlayNarrowBack/Android.mk
  packages/overlays/NavigationBarModeGesturalOverlayWideBack/Android.mk
  services/tests/servicestests/test-apps/PackageParsingTestManifests/Android.bp
  tests/Camera2Tests/CameraToo/Android.mk
  tests/Camera2Tests/CameraToo/tests/Android.mk
  tests/Camera2Tests/SmartCamera/SimpleCamera/Android.mk
  tests/Camera2Tests/SmartCamera/SimpleCamera/tests/Android.mk
  tests/CanvasCompare/Android.mk
  tests/FlickerTests/test-apps/Android.bp
  tests/LockTaskTests/Android.mk
  tests/SoundTriggerTests/Android.mk
  tools/aapt2/integration-tests/MergeOnlyTest/App/Android.mk
  tools/aapt2/integration-tests/NamespaceTest/App/Android.mk
  tools/aapt2/integration-tests/NamespaceTest/Split/Android.mk
  tools/fonts/Android.bp

Bug: 68860345
Bug: 151177513
Bug: 151953481

Test: m all

Exempt-From-Owner-Approval: janitorial work
Change-Id: I90231075f135176668586b903f2c85ec350fd527
 2021-04-21 20:55:12 +00:00
Benedict Wong
6e8c1d6da7 Add support for retrieval of configured VCNs by carrier privilege 
This change adds support for retrieval of a list of subscription groups
that have a VCN configured.

Bug: 184612525
Test: atest FrameworksVcnTests
Change-Id: I40553a7bb45d9b1f948c7d0a791f1b22a422d55c
 2021-04-21 13:49:14 -07:00
Yan Yan
f3af46a6ec Merge "Include PORT_4500 option when encoding IkeSessionParams" am: c65ed07b59 am: 33f08103fa am: 04992800bd 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1682405

Change-Id: Id235ce1f89dc48a3cf3ad26ea0217573cc1aa708
 2021-04-21 19:29:43 +00:00
Yan Yan
c65ed07b59 Merge "Include PORT_4500 option when encoding IkeSessionParams" 2021-04-21 18:08:33 +00:00
Benedict Wong
cc47505d00 Merge "Rename get/setRetryInterval to get/setRetryIntervalsMs" am: 9ef01fca2a am: a746f701e2 am: 425952791a 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1682061

Change-Id: If957c0783fd0e7f4a6340eed8cd6e19b466048a3
 2021-04-21 17:56:41 +00:00
Benedict Wong
9ef01fca2a Merge "Rename get/setRetryInterval to get/setRetryIntervalsMs" 2021-04-21 17:06:45 +00:00
Aaron Huang
5d3144c977 Merge "Add getters to NetworkStateSnapshot" into sc-dev 2021-04-21 11:20:10 +00:00
Chalard Jean
6f9f6a280d Enable policy ranking 
Test: Passes all presubmits, been tested in labs
Bug: 184834350
Change-Id: If33884aa245bcc8817bbc9c2fdfab035249e7301
 2021-04-21 11:16:44 +00:00
James Mattis
772afb9b20 Merge "Correctly count nri uid request counts" am: 1b7a5e282c am: 0c8d65b489 am: 8bc9d3464c 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1655051

Change-Id: Ibec1f37f2062827cf390eb344dd30447bdabec13
 2021-04-21 03:17:13 +00:00