Commit Graph

560721 Commits

Author SHA1 Message Date
Jack Yu
d5f25c2262 Simplified the initial attach APN logic
1. Instead of using the hardcoded order, read the order
   from configuration. This also allows carriers to specify
   the allowed types of APN can be used for initial attach.
2. Removed the preferred APN logic. The preferred APN is
   specifically for the default APN after a successful data
   setup. It's not related to initial attach.

Fix: 169657628
Test: Manual
Merged-In: I9fbf4f270726cba1281770db88fec7c1bb62e6db
Change-Id: I9fbf4f270726cba1281770db88fec7c1bb62e6db
(cherry picked from commit 0bebba7378)
2021-02-21 01:23:25 -08:00
Yan Yan
bf8113b93d Merge "Store VcnControlPlaneConfig in VcnGatewayConnectionConfig" 2021-02-17 21:22:57 +00:00
Hunter Knepshield
68612ac556 Merge "Allow optional package names in carrier configs" 2021-02-17 20:58:27 +00:00
Yan Yan
a931d4516d Merge "Create VcnControlPlaneConfig and VcnControlPlaneIkeConfig" 2021-02-17 20:40:44 +00:00
Treehugger Robot
3ad85e407e Merge "pm: Require manifest.json for .dm (dex-metadata) files." 2021-02-17 20:36:43 +00:00
Igor Murashkin
abe2776ddf pm: Require manifest.json for .dm (dex-metadata) files.
Example file:
  $> unzip CtsApkVerityTestAppPrebuilt.dm manifest.json ; cat manifest.json
  {
    "packageName": "android.appsecurity.cts.apkveritytestapp",
    "versionCode": 30
  }
  
Cherry-picked from 12af11d6f5

Test: adb install-multiple -r foo.apk foo.dm
Test: atest FrameworksServicesTests:com.android.server.pm.dex.DexMetadataHelperTest
Bug: 179295368
Merged-In: I7a3c442bb27da5948bc9ead146c77213de6b56cc
Change-Id: I7a3c442bb27da5948bc9ead146c77213de6b56cc
2021-02-17 20:34:17 +00:00
Brad Ebinger
c7baa4862f Merge "[RCS UCE] Expose the OPTIONS APIs to support OPTIONS mechanism" 2021-02-17 20:27:18 +00:00
Yan Yan
a9c1bab850 Store VcnControlPlaneConfig in VcnGatewayConnectionConfig
This CL requires callers to set a VcnControlPlaneConfig for
building VcnGatewayConnectionConfig

Bug: 163604823
Test: FrameworksVcnTests (new tests added)
Change-Id: If45cb2aa866d627f3bb9762309fe8b07bf729ba8
2021-02-17 11:25:04 -08:00
Shawn Willden
50a66e39cd Merge "Add support for app-generated attestation keys." 2021-02-17 19:12:20 +00:00
Yan Yan
c4fbd6a90c Create VcnControlPlaneConfig and VcnControlPlaneIkeConfig
VcnControlPlaneConfig contains control plane configuration for
a VCN gateway connection. VcnControlPlaneIkeConfig is a
subclass that contains IKE configuration.

The followup CL will store VcnControlPlaneConfig in
VcnGatewayConnectionConfig.

Bug: 163604823
Test: FrameworksVcnTests(new tests added)
Change-Id: If7a85ae44e77fc4477b56ffa50c6e99ee96132d0
2021-02-17 10:56:48 -08:00
Chih-hung Hsieh
ec9f1c6833 Merge "Ignore tidy checks which produce warnings" 2021-02-17 18:34:48 +00:00
James.cf Lin
603c23178a [RCS UCE] Expose the OPTIONS APIs to support OPTIONS mechanism
Expose OPTIONS portion of capability exchange APIs.

Bug: 174166957
Test: atest CtsTelephonyTestCases
Change-Id: I21277fce055f31400f2018b6f81102225cb7c7c8
2021-02-17 18:17:35 +00:00
Treehugger Robot
29ec0b24c7 Merge "Expose a setter for install scenarios" 2021-02-17 18:17:09 +00:00
Cody Kesting
f1d78f17c2 Merge changes I3242ad0e,I5daced20,Iefd284ae
* changes:
  Notify status callbacks when a VCN enters Safemode.
  Change all 'safemode' references to use 'safe mode'.
  Define VcnStatusCallback register/unregister.
2021-02-17 18:08:48 +00:00
Benedict Wong
54e89ebf18 Merge "Expose Basic VCN API surface" 2021-02-17 18:03:08 +00:00
Colin Cross
334917b860 Merge "Fix self-assign error in SimPhonebookContract" 2021-02-17 17:43:15 +00:00
James Mattis
3341199c33 Merge "Unit test automation for Per-App API functionality" 2021-02-17 17:17:30 +00:00
Brian Stack
613b8c890b Merge "Add new android.permission.UWB_PRIVILEGED" 2021-02-17 16:27:50 +00:00
Shawn Willden
bffded442a Add support for app-generated attestation keys.
This allows apps to request that AndroidKeyStore generate attestation
keys that can be used to sign attestations of other keys that the app
generates or imports.

Bug: 163606833
Test: atest CtsKeystoreTests
Change-Id: I943a6922271cbe909cb3a9d67021663b5646aa70
2021-02-17 06:46:13 -07:00
Lorenzo Colitti
f614cdce9d Merge "Expose TEST_TAP_PREFIX as system API" 2021-02-17 12:28:56 +00:00
Anton Hansson
0feadf2006 Merge "Add compat checking of the merged APIs" 2021-02-17 10:02:37 +00:00
Jooyung Han
8ab5cf670f Fix self-assign error in SimPhonebookContract
Bug: 180472752
Test: atest
FrameworksTelephonyTests: com.android.internal.telephony.uicc.IccUtilsTest
TeleServiceTests: SimPhonebookProviderTest
Change-Id: I1a8c0dabee3ca90fcdeca263a4c943e01fbae75e
2021-02-17 18:27:59 +09:00
James Mattis
ad4cae7958 Unit test automation for Per-App API functionality
Unit test automation for setOemNetworkPreference() API functionality on
ConnectivityService.

Bug: 178632672
Bug: 176494815
Bug: 170068946
Test: atest FrameworksNetTests
Change-Id: Ib76917f0fa78b736207f82d99137a6cf49481b20
2021-02-17 08:55:20 +00:00
Treehugger Robot
9a90bb9efa Merge "Add UCS-2 support for SimPhonebookContract" 2021-02-17 08:07:39 +00:00
Treehugger Robot
3a865fa8ac Merge "Do not depend on Tethering stubs in CM consts" 2021-02-17 07:11:38 +00:00
Cody Kesting
59881b17b4 Notify status callbacks when a VCN enters Safemode.
This CL updates VcnManagementService to notify VcnStatusCallbacks when
the VCN for their specified subscription group enters Safemode. In order
to be notified, the registering app must also have permissions for the
specified permission.

Bug: 163433613
Test: atest FrameworksVcnTests
Change-Id: I3242ad0ee1dc406aef56253f884c2544a994869e
2021-02-16 21:41:03 -08:00
Cody Kesting
a3da6c886e Change all 'safemode' references to use 'safe mode'.
Bug: 163433613
Test: atest FrameworksVcnTests
Change-Id: I5daced209e4e6d8d1b87385b3f64660322908fa0
2021-02-16 21:41:03 -08:00
Cody Kesting
f14145e37a Define VcnStatusCallback register/unregister.
This CL defines VcnStatusCallbacks, which are callbacks used to register
for status updates to a specific subscription group. These Callbacks may
be registered with VcnManager at any time, but will only be invoked for
the specifies subscription group and only if the registering app has
carrier privileges for that subscription.

Bug: 163433613
Test: atest FrameworksVcnTests
Change-Id: Iefd284ae2d09676d195e2a12bf660be3596da59b
2021-02-16 21:33:40 -08:00
Benedict Wong
049c180ae2 Expose Basic VCN API surface
This change exposes the Basics of the VCN API surface, including:
- VCN Configurations
- VCN Gateway Configuration superclass (Builder in subclasses)
- VcnManger with configuration management APIs

Bug: 168833866
Test: atest FrameworksVcnTests
Test: atest android.net.vcn
Change-Id: Ia1b3597d903dd84267f66546a90437f9ac45b2de
2021-02-16 21:31:00 -08:00
Treehugger Robot
a64b652d95 Merge "Adding per-app default network callbacks support" 2021-02-17 04:47:51 +00:00
Benedict Wong
d301c8544e Merge "Implement ChildSessionCallback#onIpSecTransformsMigrated" 2021-02-17 04:02:40 +00:00
Remi NGUYEN VAN
5cb4470b58 Do not depend on Tethering stubs in CM consts
Tethering API stubs depend on connectivity stubs for classes like
MacAddress or LinkAddress, so connectivity stubs cannot depend on
Tethering stubs or there would be a circular dependency.

This means ConnectivityManager API surface cannot reference Tethering
API constants. Instead, use the literal in ConnectivityManager.

This means that both ConnectivityManager and TetheringManager specify
the constant value. An alternative considered was to have
TetheringManager depend on the ConnectivityManager constants, but
considering that ConnectivityManager only has some of the constants,
this would be more confusing. Breaking the constants by mistake is
unlikely as their values are part of the API surface, so will always be
in sync.

Bug: 171540887
Test: m
Change-Id: I16b6e1912fffc5ff8b3b392901d2357ffd213c72
2021-02-17 12:04:10 +09:00
Treehugger Robot
0ae1b444ca Merge "Hide keyguard when SIM transitions to READY" 2021-02-17 02:55:34 +00:00
James Mattis
a33429ec60 Adding per-app default network callbacks support
Adding support for per-app default network changes to send callbacks
used in registerDefaultNetworkCallback() to those applications that
have the default changed as part of the per-app flow.

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

Change-Id: Id8ef987cdfbaad497929fea21b38f831c4f9b15b
2021-02-16 18:24:46 -08:00
Michele Berionne
36e6f471a2 Hide keyguard when SIM transitions to READY
The keyguard is not properly updated when the SIM PIN verification is
performed using different means than the UI. Additional states are used
before READY, so simWasLocked might be false.

Bug: 160784387
Test: manual
Change-Id: Ibca04e3d6a61c27d4b40f94a8a6223d9739b15ac
Merged-In: Ibca04e3d6a61c27d4b40f94a8a6223d9739b15ac
(cherry picked from commit d12075a949)
2021-02-17 01:41:40 +00:00
Lorenzo Colitti
2531219560 Merge "Use UserHandles instead of userId integers." 2021-02-17 01:26:44 +00:00
Cody Kesting
30d9bfa03b Merge "Implement Safemode alarm in VcnGatewayConnection." 2021-02-16 22:29:21 +00:00
Benedict Wong
d6186bdf3c Implement ChildSessionCallback#onIpSecTransformsMigrated
This change implements the Migrated callback, proxying to
onIpSecTransformCreated

Bug: 180163196
Test: atest FrameworksVcnTests
Change-Id: Ibf07be667882ea35a4d7191b87d1193f38f9db3e
2021-02-16 22:10:42 +00:00
Chih-Hung Hsieh
14d955fa96 Ignore tidy checks which produce warnings
* A bug in tidy check header filter was fixed and revealed
  many tidy check warnings in .h files. Allow these warnings
  until they are all fixed in .h files.

Test: mm with new header filter bug fixes
Change-Id: I8982a8afd5827ed3bc7b24d5985002123739aeb2
2021-02-16 21:56:26 +00:00
Treehugger Robot
6fca4110dc Merge "Cleanup of Zygote files" 2021-02-16 20:08:07 +00:00
Chris Wailes
c31c4f9b31 Cleanup of Zygote files
This CL cleans up some warnings in the ZygoteInit.java and
ZygoteServer.java files.  These warnings were mostly about unused
variables, protection class changes, and dead code.  Some changes
to code in Zygote.java and ZygoteConnection.java were needed due to
function signature changes.

Test: Built and booted image
Merged-In: I6ba33cfcb4729a75dbbd4f908f4b46110d3bb991
Change-Id: I6ba33cfcb4729a75dbbd4f908f4b46110d3bb991
2021-02-16 10:23:47 -08:00
Treehugger Robot
2a2456d3a4 Merge "dumpsys: Print total DMA-BUFs exported from the DMA-BUF heaps framework" 2021-02-16 17:58:25 +00:00
Cody Kesting
a282ea505f Implement Safemode alarm in VcnGatewayConnection.
This CL updates VcnGatewayConnection to use WakeupMessages to support
Safemode detection. Safemode is entered if the VcnGatewayConnection
instance takes more than SAFEMODE_TIMEOUT_SECONDS seconds to a) go from
DisconnectedState to ConnectedState, or b) exit and re-enter
ConnectedState. If this timeout is exceeded, the instance will notify
its managing Vcn via VcnGatewayStatusCallback#onEnteredSafemode.

Bug: 178140973
Test: atest FrameworksVcnTests
Change-Id: Iff40aba639b465c3959ef383f1001be419daba4d
2021-02-16 09:46:07 -08:00
Bram Bonné
6d3bd2dca6 Merge "Expand documentation for PURPOSE_AGREE_KEY" 2021-02-16 17:05:00 +00:00
Chris Wailes
8c2a706895 Expose a setter for install scenarios
This CL adds a setter for the install scenario data of the SessionParams
object in PackageInstaller.

Test: atest InstallSessionParamsUnitTest
Bug: 179841918
Change-Id: I9260d58285a5d0a051d2bdafa6ba6b23a739de01
2021-02-16 09:01:24 -08:00
Cody Kesting
b244bfa4d6 Merge "Use WakeupMesage for delayed events in VcnGatewayConnection." 2021-02-16 14:54:30 +00:00
Cody Kesting
864b62491d Merge "Acquire WakeLock while processing Gateway messages." 2021-02-16 14:54:16 +00:00
Treehugger Robot
fcf6560011 Merge "[LSC] Add LOCAL_LICENSE_KINDS to frameworks/base" 2021-02-16 14:50:57 +00:00
Marcus Hagerott
407164df11 Add UCS-2 support for SimPhonebookContract
This simplifies the API by eliminating the need to attempt to detect
and report unsupported characters.

Test: atest FrameworksTelephonyTests:com.android.internal.telephony.uicc.IccUtilsTest TeleServiceTests:SimPhonebookProviderTest
Bug: 154363919
Change-Id: Ica8f3a642ee50ca81c43822ba39c0a071c279705
2021-02-16 06:47:23 -08:00
Treehugger Robot
6916f91f55 Merge "Prevent tests with reboot from running during presubmit" 2021-02-16 12:15:16 +00:00