Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
531,711 Commits 3 Branches 0 Tags
b5062e7dbd3ed92809cae2eedea0365938d5dbac
Commit Graph

531711 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Benedict Wong
b5062e7dbd Merge "Add NetworkProvider to VcnManagementService" am: bdcdfa7c9c am: 4c09ba622e 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1486652

Change-Id: Ia76537c6b5faf52a2ae723ae8aa31dc2e4186467
 2020-11-17 23:22:52 +00:00
Benedict Wong
4c09ba622e Merge "Add NetworkProvider to VcnManagementService" am: bdcdfa7c9c 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1486652

Change-Id: I5d11e5238cecb2ecd2383e9ff6e78ade9eb77731
 2020-11-17 22:59:15 +00:00
Benedict Wong
bdcdfa7c9c Merge "Add NetworkProvider to VcnManagementService" 2020-11-17 22:26:04 +00:00
Treehugger Robot
a475e3f791 Merge "Fixed Handler Leak on RecyclerView" am: 62b028daca am: 78ac7dd921 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1495867

Change-Id: Ib4069ff9007cdb67387b7e81e8dd51f609ca1a59
 2020-11-17 21:23:49 +00:00
Treehugger Robot
78ac7dd921 Merge "Fixed Handler Leak on RecyclerView" am: 62b028daca 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1495867

Change-Id: I37b25039cb15a54f10c3e413a2917429f5f10694
 2020-11-17 20:35:15 +00:00
Treehugger Robot
0295cca6a4 Merge "Catch SSE when no subId is loaded" am: cc3f4cc083 am: 317c552a80 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1501011

Change-Id: If28ef033201d54439b6a5b01a7c8196d8af0b18f
 2020-11-17 20:28:44 +00:00
Treehugger Robot
62b028daca Merge "Fixed Handler Leak on RecyclerView" 2020-11-17 20:17:44 +00:00
Treehugger Robot
317c552a80 Merge "Catch SSE when no subId is loaded" am: cc3f4cc083 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1501011

Change-Id: Ibda753abec714576986b5ca94e65eb64091d1e26
 2020-11-17 20:07:47 +00:00
Treehugger Robot
cc3f4cc083 Merge "Catch SSE when no subId is loaded" 2020-11-17 19:33:50 +00:00
Songchun Fan
fcf66c36d8 Merge "Restore preferred activity filter if it not inside" am: d8c6106f91 am: d45305b25c 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1483964

Change-Id: I62a1c68a761d515c7cbccc3868bf91def5fb9d7c
 2020-11-17 18:52:37 +00:00
Songchun Fan
d45305b25c Merge "Restore preferred activity filter if it not inside" am: d8c6106f91 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1483964

Change-Id: Ibd8117e576d3c456fd5f8688e93b12e30d7a1f7b
 2020-11-17 18:29:01 +00:00
Songchun Fan
d8c6106f91 Merge "Restore preferred activity filter if it not inside" 2020-11-17 18:09:21 +00:00
Anton Hansson
349f9002e4 Merge "Remove current.txt files" am: a637f2771d am: 188733a56e 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1500052

Change-Id: I5e0c5766d6cbba60d61c64d9bbfd83be5b2f876b
 2020-11-17 15:49:47 +00:00
Anton Hansson
188733a56e Merge "Remove current.txt files" am: a637f2771d 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1500052

Change-Id: Ief0dbfab6808f3bb59cc6b74933a8ac1d802e11d
 2020-11-17 15:31:19 +00:00
Anton Hansson
a637f2771d Merge "Remove current.txt files" 2020-11-17 15:16:54 +00:00
Lucas Lin
9eddbf8e3f Merge "Don't use @hide API - ConnectivityManager#getNetworkTypeName()" am: 15c869f6ad am: d8cb139d7c 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1495900

Change-Id: Ia6c9856c0e35ad4badcf0ba2c109f1ae8648c685
 2020-11-17 12:30:40 +00:00
Lucas Lin
1cf1feee5f Merge "Define and use default request in Ikev2VpnRunner" am: d4235a815c am: 1a2d80e256 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1495898

Change-Id: I42fd8968c34fcf246db6133b2ecccfac35bc738f
 2020-11-17 11:56:51 +00:00
Lucas Lin
e0abbef018 Merge "Separate 2 tests to verify canBeSatisfiedBy()" am: f01b37a7c2 am: 54527beee2 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1495268

Change-Id: If94d24c57b5f982180b04bad236c524183e4c5af
 2020-11-17 11:56:30 +00:00
Automerger Merge Worker
b555276d2d Merge "Merge "Fix the comments left on aosp/1481197" am: 464bc344a5 am: 3a37cb6552" into rvc-d1-dev-plus-aosp 2020-11-17 11:56:14 +00:00
Lucas Lin
c9ce76dece Merge "Fix the comments left on aosp/1481197" am: 464bc344a5 am: 3a37cb6552 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1494036

Change-Id: I6fca5804b1b70803cf0e3666da2870c299f089e5
 2020-11-17 11:54:58 +00:00
Lucas Lin
d8cb139d7c Merge "Don't use @hide API - ConnectivityManager#getNetworkTypeName()" am: 15c869f6ad 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1495900

Change-Id: Ia4177dae1104cc67ec8e0a1bf9d8765291afec1f
 2020-11-17 09:35:40 +00:00
Lucas Lin
1a2d80e256 Merge "Define and use default request in Ikev2VpnRunner" am: d4235a815c 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1495898

Change-Id: I1be9a5f7ef581bb5b5e2c7bfd40b9380a0abd838
 2020-11-17 09:28:13 +00:00
Lucas Lin
54527beee2 Merge "Separate 2 tests to verify canBeSatisfiedBy()" am: f01b37a7c2 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1495268

Change-Id: I8b2d43d11570f90b1bfa23c27fccb592269b16c9
 2020-11-17 09:22:34 +00:00
Lucas Lin
15c869f6ad Merge "Don't use @hide API - ConnectivityManager#getNetworkTypeName()" 2020-11-17 08:40:01 +00:00
Lucas Lin
d4235a815c Merge "Define and use default request in Ikev2VpnRunner" 2020-11-17 08:39:17 +00:00
lucaslin
3d4941b9c2 Define and use default request in Ikev2VpnRunner 
Vpn might be included in ConnectivityService mainline module, so
it should prevent calling @hide API. Even if Vpn isn't included
in ConnectivityService mainline module eventually, it's still
fine to use local defined default request instead of calling
@hide API.
Ideally, ConnectivityManager will provide a new API which can
provide the status of physical network even though there is a
virtual network. b/147280869 is used for tracking the new API.

Bug: 172183305
Test: atest FrameworksNetTests
Test: atest CtsNetTestCasesLatestSdk
Test: Manual setup IKEV2 VPN connection.
Change-Id: If76e7497bef4890a74641695c3ebd395795bbe7f
 2020-11-17 08:38:45 +00:00
Lucas Lin
f01b37a7c2 Merge "Separate 2 tests to verify canBeSatisfiedBy()" 2020-11-17 08:38:07 +00:00
Lucas Lin
25ee58aa4d Merge "Fix the comments left on aosp/1481197" am: 464bc344a5 am: 3a37cb6552 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1494036

Change-Id: Iea77eb0ed2ca0b5603d1257496bd1e8a14ed0d77
 2020-11-17 08:11:57 +00:00
Lucas Lin
3a37cb6552 Merge "Fix the comments left on aosp/1481197" am: 464bc344a5 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1494036

Change-Id: I7f13f380db5fe30e67be9cedc9429519b9fd4b6e
 2020-11-17 07:47:54 +00:00
lucaslin
ff493c4f0a Don't use @hide API - ConnectivityManager#getNetworkTypeName() 
To prevent calling @hide API, print definition of network type
directly instead of calling @hide API.

Bug: 172183305
Test: atest FrameworksNetTests
Test: atest CtsNetTestCasesLatestSdk
Test: Setup a platform VPN and enable VPN always-on, then check
      the log.
Change-Id: I807e90537f706face51c5cc221490ea742d22a0e
 2020-11-17 07:07:29 +00:00
Lucas Lin
464bc344a5 Merge "Fix the comments left on aosp/1481197" 2020-11-17 07:06:46 +00:00
Benedict Wong
a0740b9727 Merge "Add stubs for VCN configuration management" am: 03492715e8 am: 43dbf5cb2c 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1477377

Change-Id: I7e4d790a88e8fd9ce02040716c8798b0ba80234d
 2020-11-17 03:23:13 +00:00
Benedict Wong
43dbf5cb2c Merge "Add stubs for VCN configuration management" am: 03492715e8 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1477377

Change-Id: I50d193a3ba9cf47c8e4802d4ac294384ae10a2b5
 2020-11-17 02:32:56 +00:00
Benedict Wong
03492715e8 Merge "Add stubs for VCN configuration management" 2020-11-17 02:17:21 +00:00
Anton Hansson
90f03fa392 Remove current.txt files 
Nothing depends on these anymore. The same data is available through
the build artifact framework-base-api-current.txt.

Bug: 171029603
Test: m checkbuild
Change-Id: I13d9373f7174e2ff2bc54122a1fcfae0b7f7293c
Merged-In: I13d9373f7174e2ff2bc54122a1fcfae0b7f7293c
(cherry picked from commit b5ec8a9a10)
 2020-11-17 00:16:59 +00:00
Treehugger Robot
365c77133b Merge changes I9731d978,I9e325782,I441a4d4d,I86a85e48,I9268fd66, ... am: aeb15e8592 am: 788f03de26 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1471565

Change-Id: I495aa0430b4ddd2137a8b07af7dbe56ffe9a49d3
 2020-11-17 00:10:48 +00:00
madym
b570fbc30f Merge "Remove mrenouf from Shell/OWNERS" am: febaec9f3e am: b58226efcd 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1500070

Change-Id: Ifbef79097437aa2dec8eee24a9cf6875615ddd15
 2020-11-17 00:09:50 +00:00
Brad Ebinger
18958eaee7 Catch SSE when no subId is loaded 
Correctly catch SSEs in ImsRcsManager and RcsUceAdapter and rethrow
as checked ImsExceptions instead of using RuntimeExceptions.

Fixes: 173436604
Test: atest CtsTelephonyTestCases:ImsServiceTest
Change-Id: I80dde5556c1239f89a258b0f57f7feceb142aec7
 2020-11-16 15:32:59 -08:00
Treehugger Robot
788f03de26 Merge changes I9731d978,I9e325782,I441a4d4d,I86a85e48,I9268fd66, ... am: aeb15e8592 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1471565

Change-Id: I3b5af42cdab9357fa4f4a0924af206f1df5488e4
 2020-11-16 23:24:52 +00:00
Treehugger Robot
aeb15e8592 Merge changes I9731d978,I9e325782,I441a4d4d,I86a85e48,I9268fd66, ... 
* changes:
  Keystore 2.0 SPI: Install legacy Keystore provider as AndroidKeyStoreLegacy
  Keystore 2.0 SPI: Zygote install Keystore2 provider conditionally
  Keystore 2.0 SPI: Evolve the generator SPI.
  Keystore 2.0 SPI: Evolve Factory SPI
  Keystore 2.0 SPI: AndroidKeyStoreProvider loads keys from Keystore 2.0
  Keystore 2.0 SPI: Evolve the Crypto SPI.
  Keystore 2.0 SPI: KeyParameter utilities.
  Keystore 2.0 SPI: Update the chunked streamer.
  Keystore 2.0 SPI: KeyStoreCryptoOperationUtils
  Keystore 2.0 SPI: KeyStoreKeys adopt Keystore 2.0
  Keystore 2.0: Shim around the basic functionality of Keystore 2.0
  Keystore 2.0 SPI: Duplicate Keystore SPI to android.security.keystore2 package
 2020-11-16 22:51:03 +00:00
Benedict Wong
0acd4caf23 Add NetworkProvider to VcnManagementService 
This change adds a skeleton VcnNetworkProvider, and registers it with
ConnectivityService upon system startup.

Bug: 163431879
Test: FrameworksVcnTests passing
Change-Id: I7720db1cea805cbdca052a2e37cb2d754189ea05
 2020-11-16 13:29:34 -08:00
Benedict Wong
4b140e2bd6 Add stubs for VCN configuration management 
This change adds stubs for both the API and the internal binder
interfaces.

Bug: 163431877
Test: Compiles, boots
Change-Id: I11183d9fe3ad53944882b163eee5110e85898393
 2020-11-16 13:29:34 -08:00
Yan Yan
984f6a74ad Merge changes from topics "PersistableBundleUtils", "bytearray-utils", "integer-utils" am: e9226f999f am: 089a20034d 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1495099

Change-Id: I6acf78b6eaf0ad2661b66a9f3e202b2a74b37233
 2020-11-16 21:14:51 +00:00
madym
b58226efcd Merge "Remove mrenouf from Shell/OWNERS" am: febaec9f3e 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1500070

Change-Id: I750b2bafdbf63bf1c5c3b1997ca726183f768fcb
 2020-11-16 21:14:01 +00:00
Aurimas Liutikas
1c505e8cda Merge "Remove legacy style metalava suppression" am: e1bb600fc7 am: 66574f225e 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1421698

Change-Id: Idd656e3803c247b03808259c582599898c064b27
 2020-11-16 21:13:46 +00:00
madym
febaec9f3e Merge "Remove mrenouf from Shell/OWNERS" 2020-11-16 19:18:17 +00:00
Yan Yan
089a20034d Merge changes from topics "PersistableBundleUtils", "bytearray-utils", "integer-utils" am: e9226f999f 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1495099

Change-Id: Ieaba73b1b2c97744193d56f841bd95fe3cf67da7
 2020-11-16 18:11:34 +00:00
Aurimas Liutikas
66574f225e Merge "Remove legacy style metalava suppression" am: e1bb600fc7 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1421698

Change-Id: I86186f315dbac925c11f99993dd71703bd12d6ca
 2020-11-16 17:58:37 +00:00
Yan Yan
e9226f999f Merge changes from topics "PersistableBundleUtils", "bytearray-utils", "integer-utils" 
* changes:
  Support converting integer to/from PersistableBundle
  Support converting byte array to/from PersistableBundle
  Include PersistableBundleUtils in framework-ike-shared-srcs
  Add utils for converting Maps and ParcelUuid to/from PersistableBundle
  Add utilities to persist lists of Persistable objects
 2020-11-16 17:41:44 +00:00
Aurimas Liutikas
e1bb600fc7 Merge "Remove legacy style metalava suppression" 2020-11-16 17:40:07 +00:00