Commit Graph

688382 Commits

Author SHA1 Message Date
Treehugger Robot
6d1cecb385 Merge "Persist permission state for updated apps synchronously." 2022-05-19 03:00:44 +00:00
Lucas Lin
77a0e3da9e Merge "Address leftover comments of ag/18108411" 2022-05-19 01:45:49 +00:00
Treehugger Robot
467ebb8379 Merge "Consolidate input OWNERS files" 2022-05-18 18:42:33 +00:00
Treehugger Robot
27e3cc6f2b Merge "Update OWNERS for appwidgets" 2022-05-18 15:51:45 +00:00
Treehugger Robot
003d08c7fd Merge "Revert "DO NOT MERGE temporarily disabled new data stack"" 2022-05-18 05:31:44 +00:00
Pinyao Ting
12adb658a0 Update OWNERS for appwidgets
Test: manual
Change-Id: I2bb2ddc4bd94e9e80d606e5141f336550eab8c88
2022-05-17 22:59:24 +00:00
Hai Zhang
36ee4c554b Persist permission state for updated apps synchronously.
Because if we lose the changes, an updated app won't be reconsidered for
new install permissions.

Fixes: 221899913
Test: presubmit
Change-Id: Ib82189b07cf4dfd132be37fb19843d770e871f8c
Merged-In: Ib82189b07cf4dfd132be37fb19843d770e871f8c
2022-05-17 21:15:18 +00:00
Jack Yu
9086501371 Revert "DO NOT MERGE temporarily disabled new data stack"
This reverts commit cbd1ca5905.

Reason for revert: all required CLs are in AOSP now.

Change-Id: Ia03b6db224b361c7e997b109d549502d82817ec0
2022-05-17 20:56:50 +00:00
Treehugger Robot
dcbb21deaa Merge "Make binderDied(IBinder who) public API" 2022-05-17 17:37:10 +00:00
Seth Moore
bf73616e23 Merge "Ensure key generation retries after remote key provisioning" 2022-05-17 15:37:24 +00:00
Seth Moore
b51dd03878 Ensure key generation retries after remote key provisioning
Previously, the key pair generation would error out even if we
successfully provisioned attestation keys. Instead, we should retry
key generation after the GenerateRkpKeyService reports an OK status.

Bug: 231495834
Test: RemoteProvisionerUnitTests
Change-Id: I049294cbc7119de55b5de02499bf4609d4c6de5d
Merged-In: I049294cbc7119de55b5de02499bf4609d4c6de5d
2022-05-16 16:11:32 -07:00
Xusong Wang
92ce74409b Merge "Fix bug in Blend that did not use options." 2022-05-16 22:40:50 +00:00
Jean-Luc Brouillet
1f42ae9112 Fix bug in Blend that did not use options.
For one of the many variants of Blend, a cut&paste error made
that the options were not passed.

This was not caught because no test exercised this.

I've added the test (in a related CL) and fixed the bug.

Bug: 178718752
Test: Ran the RS Java tests
Change-Id: Ide2fef96137ffd89e4431cf15be5df398036d909
Merged-In: Ide2fef96137ffd89e4431cf15be5df398036d909
(cherry picked from commit a2c6eb2f1a)
2022-05-16 13:44:32 -07:00
Yan Yan
2775f8a1d1 Merge "Use token to identify IKE Session" 2022-05-16 20:27:52 +00:00
lucaslin
a0cb82f78b Address leftover comments of ag/18108411
Bug: 229799060
Test: atest FrameworksNetTests:VpnTest
Change-Id: Iade04ede17b9371e530556acb2bd84c4b57c1581
2022-05-17 00:45:57 +08:00
Lorenzo Colitti
92891b4bcb Merge "Don't throw in socket_read if socket_read_all returns < 0." 2022-05-16 13:00:13 +00:00
Treehugger Robot
9feb61d1e6 Merge "media jni: fix CryptoException error code to string" 2022-05-16 09:17:03 +00:00
Lucas Lin
d34c7307f6 Merge changes I0b129ec3,I49a5aee1
* changes:
  Address leftover comments of ag/18112116
  Rename vars of Ikev2VpnRunner
2022-05-16 08:27:34 +00:00
Treehugger Robot
01447fa5e4 Merge "PBAP: Do not set phonebook access to ACCESS_REJECTED automatically" 2022-05-16 07:40:23 +00:00
Robert Shih
3401098d26 media jni: fix CryptoException error code to string
Bug: 231468328
Test: atest WidevineFailureTests
Change-Id: I1ee13a2e91d925082261880bfe48d58f2b8b3109
Merged-In: I1ee13a2e91d925082261880bfe48d58f2b8b3109
2022-05-16 06:27:59 +00:00
Chienyuan
5bc5f10310 PBAP: Do not set phonebook access to ACCESS_REJECTED automatically
The value is saved in SharedPreferences. However, it will return ACCESS_UNKNOWN in several cases. We shouldn't set it as rejected automatically. We should ask user when PBAP connect.

Bug: 230712201
Test: manual
Change-Id: Ia3f373b9799cf02c47dc782688430fb234491f61
2022-05-16 03:35:16 +00:00
Ling Ma
ecb5d530c2 Merge "Make registrationState consistent with RoamType in case of override" 2022-05-15 23:56:31 +00:00
Taras Antoshchuk
e6cf914c3f Don't throw in socket_read if socket_read_all returns < 0.
All codepaths in socket_read_all that return a negative value have
already thrown an exception. socket_read should not throw again.

This causes debuggagle apps to crash with a JNI failure if
LocalSocket#read gets an error.

Test: atest CtsNetTestCases
Bug: 229813087
Change-Id: I2a04a799d3748c221f8555fa7afc40d73f0f392c
2022-05-15 18:03:55 +00:00
Ling Ma
17b399056a Make registrationState consistent with RoamType in case of override
Bug: 231357778
Test: manual + atest frameworks/opt/telephony/tests/telephonytests/src/com/android/internal/telephony/NetworkRegistrationInfoTest.java
Merged-In: Ibf74839f688df587d1f791795924a8152c52e3dc
Change-Id: Ibf74839f688df587d1f791795924a8152c52e3dc
2022-05-14 17:09:53 -07:00
Wonsik Kim
4f9ab851b3 Merge "MediaCodec: don't cache buffers until requested" 2022-05-14 00:05:05 +00:00
Wonsik Kim
07358dfea5 MediaCodec: don't cache buffers until requested
Bug: 189889230
Test: manual & presubmit
Change-Id: I4caca59d6854416cedb6758fe66aefaacb69beb7
2022-05-14 00:04:51 +00:00
Lucas Dupin
6562eb87f3 Merge "[Bugfix][BootAnimation] Fix the issue of the transparent background image shows transparent background unexpectedly in BootAnimation on some MTK platforms." 2022-05-13 23:02:22 +00:00
Yan Yan
b93a40558c Use token to identify IKE Session
This commit updates VPN to use an integer token to identify an IKE
Session.

This is a preparation commit to enable IKE mobility where an IKE
Session will be able to migrate to a different network and thus network
can no longer identify an IKE Session.

Bug: 192077544
Test: atest IkeV2VpnTest
Test: atest com.android.server.connectivity.VpnTest
Change-Id: I18d9a049587d7dfc05e2143320431014d053abbc
2022-05-13 11:27:27 -07:00
Sam Delmerico
f111beaa39 Merge "disable usage of plugins as static libs" 2022-05-13 17:57:15 +00:00
Treehugger Robot
3d7b4e4ded Merge "Add new Telephony feature flags and update API annotations" 2022-05-13 17:13:38 +00:00
Eran Messeri
a1ae227bc2 Merge "Keystore: Wire X25519 key agreement" 2022-05-13 13:40:09 +00:00
xi yu
c341544c80 [Bugfix][BootAnimation] Fix the issue of the transparent background image shows transparent background unexpectedly in BootAnimation on some MTK platforms.
Test: manual

Change-Id: I2074a48c6d3fc11f393bfa4fbcbcd8d0df5c780f
2022-05-13 09:03:00 +00:00
Miguel Aranda
90c3935195 Merge "Fix ZipFilePerfTest issues by closing the file in each loop iteration." 2022-05-13 08:54:32 +00:00
Miguel
f153f7c154 Fix ZipFilePerfTest issues by closing the file in each loop iteration.
Test: atest ZipFilePerfTest
Bug: 231407205
Change-Id: Ie37da23b9e8468588893a3d4673b6a6350631408
2022-05-13 08:54:23 +00:00
Miguel Aranda
2385e75640 Merge "Separate timeNumberFormatTrivialFormatLong into its own file and delete HostnameVerifierTest." 2022-05-13 08:54:04 +00:00
Martijn Coenen
e202bd7dcb Merge "Add SDK level check to adding sandbox UIDs." 2022-05-13 08:26:02 +00:00
Treehugger Robot
dca2e07727 Merge "Clean up hard-coded min_sdk_version/apex_available" 2022-05-13 04:56:59 +00:00
Martijn Coenen
ab678b983b Add SDK level check to adding sandbox UIDs.
ConnectivityServiceTest builds against the latest Vpn framework code,
but when run on an older base image (eg 'S'), said framework code might
run into runtime errors calling new APIs. Until the test is decoupled,
do the SDK level check here.

Bug: 230548427
Bug: 232420362
Test: Build
Change-Id: If453e16e680f46cf2b9eb769e5607fb5513b32ac
2022-05-13 04:47:39 +00:00
lucaslin
5226b1f416 Address leftover comments of ag/18112116
Bug: 225010642
Test: atest FrameworksNetTests:VpnTest
Change-Id: I0b129ec322159f608c447f608a4e11bed1971b55
2022-05-13 00:59:15 +00:00
lucaslin
c9bd64daf3 Rename vars of Ikev2VpnRunner
There is already a var which is named mNetworkCapabilities in Vpn
class. In order to simply distinguish Vpn#mNetworkCapabilities and
Ikev2VpnRunner#mNetworkCapabilities, rename the one in
Ikev2VpnRunner to mUnderlyingNetworkCapabilities, also change
Ikev2VpnRunner#mLinkProperties to mUnderlyingLinkProperties.

Bug: 191413541
Test: atest FrameworksNetTest#VpnTest
Change-Id: I49a5aee159baa1d1583abb94d73da9fbc03ffe07
2022-05-13 00:59:06 +00:00
Ovidiu Pana
2274d85fe6 Merge "Unhide LogSessionId constant." 2022-05-12 23:28:03 +00:00
Eran Messeri
16882a2ac3 Keystore: Wire X25519 key agreement
Implement support for the X25519 key agreement functionality.

Similar to Ed25519, two new classes are added:
* AndroidKeyStoreXDHPrivateKey
* AndroidKeyStoreXDHPublicKey

The private key class is simply a handle to the KeyMint key.
The public key class implements XECPublicKey, the interface
needed for using this key in a platform-backed key agreement.

Because of Conscrypt API boundaries, the functionality of Conscrypt's
OpenSSLX25519PublicKey is duplicated here - namely, matching the
prefix of the encoded key.

Bug: 194359292
Test: atest android.keystore.cts.Curve25519Test
Change-Id: Ifc12be528ab544fd6909bb0dd6224a0a4dd400c6
Merged-In: Ifc12be528ab544fd6909bb0dd6224a0a4dd400c6
2022-05-12 23:00:16 +01:00
Treehugger Robot
fe5f242360 Merge "Add new MMS result codes" 2022-05-12 20:26:13 +00:00
Roman Kiryanov
513f7d83b0 Merge "Cleanup in EmulatorClipboardMonitor (4)" 2022-05-12 19:28:51 +00:00
Roman Kiryanov
306e3bb857 Merge "Cleanup in EmulatorClipboardMonitor (3)" 2022-05-12 19:10:55 +00:00
Hui Wang
160a0832e7 Add new Telephony feature flags and update API annotations
Bug: 206437821
Test: make
Test: atest CtsTelephonyTestCases FrameworksTelephonyTests
Change-Id: I511afb5afc52b859a37f8ae27ab671c2b8037527
Merged-In: I511afb5afc52b859a37f8ae27ab671c2b8037527
2022-05-12 11:12:39 -07:00
Tom Taylor
88b5149d4e Add new MMS result codes
Test: manual - sent/received mms
Bug: 185275986

Change-Id: I190345240482437289d26101857d805cf06e0341
Merged-In: I190345240482437289d26101857d805cf06e0341
2022-05-12 11:05:06 -07:00
Treehugger Robot
821acc6177 Merge changes I5241086c,I3e96ab6a
* changes:
  Cleanup in EmulatorClipboardMonitor (2)
  Cleanup in EmulatorClipboardMonitor (1)
2022-05-12 17:21:37 +00:00
Treehugger Robot
e07281f079 Merge "Make PCC indication logic consistent between HIDL and AIDL" 2022-05-12 16:19:08 +00:00
Treehugger Robot
49abc6feca Merge "Add default value for TCP buffers" 2022-05-12 16:19:03 +00:00