Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
564,538 Commits 3 Branches 0 Tags
93939f0a3ead0105813aaa2ae5d6a80ff2d9d6cd
Commit Graph

564538 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Mitch Phillips
93939f0a3e Merge "[MemInit] Use new MemInit API." am: 8a956c5f9c am: cad354ec50 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1555544

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Iaf0409fad8f590e4f92049104ceb4fe7fac1ff4b
 2021-02-02 00:44:27 +00:00
Serik Beketayev
fd1c39231f Merge "[Mainline] Migrate com.google.android.collect pkg" am: b9c6a7470e am: 82e4d3638c 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1552881

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ica65ce3224b636cf71b69e37ff9f36315e9309f5
 2021-02-02 00:31:05 +00:00
Daniel Bright
a9ec691601 Merge "Partial hal support for secondary link bandwidth" am: bed5f6e84d am: 3504c8c759 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1565115

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I95842d0e704aa3ddf0e0f9c19b411fa93a64e402
 2021-02-02 00:30:49 +00:00
Lorenzo Colitti
39645c256c Merge "Add UsbHandlerTest test for NCM and RNDIS at the same time." am: d6d96a4625 am: b6925c2fc7 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1565204

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Idca8b8f2b16cc6290f42e917dc337f096621ff29
 2021-02-02 00:30:20 +00:00
Mitch Phillips
cad354ec50 Merge "[MemInit] Use new MemInit API." am: 8a956c5f9c 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1555544

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I1332e4476cc8470791cacae0bbe605a24d1e3b18
 2021-02-02 00:04:59 +00:00
Serik Beketayev
82e4d3638c Merge "[Mainline] Migrate com.google.android.collect pkg" am: b9c6a7470e 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1552881

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I1648cf0bc1803d59787edb8715b0abc63728cc5d
 2021-02-01 23:50:59 +00:00
Daniel Bright
3504c8c759 Merge "Partial hal support for secondary link bandwidth" am: bed5f6e84d 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1565115

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ib46315e1fe0bf0a69cc17c6d73cd913379a73845
 2021-02-01 23:42:52 +00:00
Lorenzo Colitti
b6925c2fc7 Merge "Add UsbHandlerTest test for NCM and RNDIS at the same time." am: d6d96a4625 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1565204

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Id00ebe6331ae65ba4c3ee2f549e89ba3a527bd2c
 2021-02-01 23:32:34 +00:00
Mitch Phillips
8a956c5f9c Merge "[MemInit] Use new MemInit API." 2021-02-01 23:32:24 +00:00
Serik Beketayev
b9c6a7470e Merge "[Mainline] Migrate com.google.android.collect pkg" 2021-02-01 23:11:56 +00:00
Mikhail Naganov
83a3a64130 Merge "Remove audio HAL V2 from "interfaces of interest"" am: 499850f976 am: 15b8dd5aad 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1564505

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I8c36052991a1ab344d21a736f791ffa008fa02ae
 2021-02-01 22:57:54 +00:00
Daniel Bright
bed5f6e84d Merge "Partial hal support for secondary link bandwidth" 2021-02-01 22:48:44 +00:00
Lorenzo Colitti
d6d96a4625 Merge "Add UsbHandlerTest test for NCM and RNDIS at the same time." 2021-02-01 22:45:00 +00:00
Mikhail Naganov
15b8dd5aad Merge "Remove audio HAL V2 from "interfaces of interest"" am: 499850f976 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1564505

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I10bb28505163ae9651c9191ef11bc17500dd6b07
 2021-02-01 22:20:27 +00:00
Mikhail Naganov
499850f976 Merge "Remove audio HAL V2 from "interfaces of interest"" 2021-02-01 21:22:39 +00:00
Janis Danisevskis
69ffb7d195 Merge "Keystore 2.0 SPI: Small fix to apease CTS test." am: f246dc6346 am: b30a7eb006 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1564074

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I86c5c808f585ff6a721f233b69d44826a44bd5fa
 2021-02-01 20:52:28 +00:00
Janis Danisevskis
b30a7eb006 Merge "Keystore 2.0 SPI: Small fix to apease CTS test." am: f246dc6346 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1564074

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ie1363de7ca5d2600cfa999627ead673752e43b91
 2021-02-01 19:58:52 +00:00
Benedict Wong
843c68e56d Merge "Remove usages of hidden connectivity APIs" am: 8d8f48f0fd am: 4ef820417a 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1564501

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Iddf62ae4f8ade6b3d1965b66a5e983eab6fbab8c
 2021-02-01 19:35:17 +00:00
Grace Jia
3771f5e563 Merge "Add relative APIs for InCallService that can support self-managed connections that want to expose itself." am: 59c47d24fc am: f5468331b4 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1526998

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I166bd3ba72e1ffa4e6297bd7ec69fde1f15bd1d7
 2021-02-01 19:34:58 +00:00
Benedict Wong
4ef820417a Merge "Remove usages of hidden connectivity APIs" am: 8d8f48f0fd 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1564501

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I8c9125091d0d348f310c31e59d5e94f7b6e9a8c0
 2021-02-01 18:49:48 +00:00
Janis Danisevskis
f246dc6346 Merge "Keystore 2.0 SPI: Small fix to apease CTS test." 2021-02-01 18:33:32 +00:00
Grace Jia
f5468331b4 Merge "Add relative APIs for InCallService that can support self-managed connections that want to expose itself." am: 59c47d24fc 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1526998

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I64ff49bbb502052a4e19a654170ff953c378c664
 2021-02-01 18:18:11 +00:00
Benedict Wong
8d8f48f0fd Merge "Remove usages of hidden connectivity APIs" 2021-02-01 18:10:35 +00:00
Keun-young Park
f0544eadfb Merge "Change setPrimaryStorageUuid to handle it for the current user" into rvc-qpr-dev am: 6c1e915306 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13438906

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I25ef90ea0542ebaa4ea300a6c43906e469a3b840
 2021-02-01 18:00:09 +00:00
Grace Jia
59c47d24fc Merge "Add relative APIs for InCallService that can support self-managed connections that want to expose itself." 2021-02-01 17:55:33 +00:00
Keun-young Park
6c1e915306 Merge "Change setPrimaryStorageUuid to handle it for the current user" into rvc-qpr-dev 2021-02-01 17:26:53 +00:00
Lorenzo Colitti
7720b1f3d9 Merge "Revert "Expose IPsec tunnel APIs from @SystemApi to public APIs"" am: 5a700b2725 am: f681bee340 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1564979

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I324ea0a931e3b8da4b0bd11ef550312a21156f1f
 2021-02-01 16:43:26 +00:00
Lorenzo Colitti
f681bee340 Merge "Revert "Expose IPsec tunnel APIs from @SystemApi to public APIs"" am: 5a700b2725 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1564979

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I147a86d5252f29a88d3a0fdb5c27d4c101791e7c
 2021-02-01 16:04:06 +00:00
Lorenzo Colitti
5a700b2725 Merge "Revert "Expose IPsec tunnel APIs from @SystemApi to public APIs"" 2021-02-01 15:33:11 +00:00
Anton Hansson
f90849a2d1 Merge changes If81cda01,I1df8b8e0 am: 3351717493 am: 389332a285 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1566280

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Id7c521e779ba55f7bea832ade8ff92d9465339bd
 2021-02-01 15:21:06 +00:00
Anton Hansson
15278c6c7d Limit build visibility of modules in apex/... am: 096a1756fb am: 285c6a2018 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1566279

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ic00979a482e8ae725a57dee8c0e59b8dd296cad6
 2021-02-01 15:21:02 +00:00
Anton Hansson
389332a285 Merge changes If81cda01,I1df8b8e0 am: 3351717493 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1566280

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I26af56f725ad03555b7991f51cfbebbbbdd758d7
 2021-02-01 14:54:47 +00:00
Grace Jia
4e8dc10871 Add relative APIs for InCallService that can support self-managed 
connections that want to expose itself.

Add PhoneAccount#EXTRA_ADD_SELF_MANAGED_CALLS_TO_INCALLSERVICE and
Connection#onInCallServiceTrackingChanged.

Bug: 161144815
Test: CtsTelecomTestCases
Change-Id: I0a42ea79a1cd46aa9df3399c4fa2e9396321778a
Merged-In: I0a42ea79a1cd46aa9df3399c4fa2e9396321778a
 2021-02-01 14:51:31 +00:00
Anton Hansson
285c6a2018 Limit build visibility of modules in apex/... am: 096a1756fb 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1566279

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ie104a8cce24b86fe6dbea57119ee2a9090edb7ce
 2021-02-01 14:50:38 +00:00
Anton Hansson
3351717493 Merge changes If81cda01,I1df8b8e0 
* changes:
  Suppress [CallbackInterface] metalava rule for mainline modules.
  Limit build visibility of modules in apex/...
 2021-02-01 14:02:20 +00:00
Lorenzo Colitti
4cb54827a0 Merge changes Idcc9e32c,I58769bb7 am: d4caba4daf am: 2425886baa 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1552503

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I309434985d7dc6c1cbcb411f6f08ebc4dc5d37d4
 2021-02-01 12:20:27 +00:00
Lorenzo Colitti
2425886baa Merge changes Idcc9e32c,I58769bb7 am: d4caba4daf 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1552503

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: If12227f11585de18d92995cf603765b18f91764f
 2021-02-01 11:36:03 +00:00
Nicolas Geoffray
8bd985efd4 Merge "Support for showing percent progress in boot animation." am: 87d840addd am: b86c3a3470 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1545805

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ic4b699c54e725f6bde23d9f0123536bd2f0d6366
 2021-02-01 11:02:58 +00:00
Lorenzo Colitti
d4caba4daf Merge changes Idcc9e32c,I58769bb7 
* changes:
  Remove getFilteredNetworkState and add @NonNull in NetworkState.
  Add test coverage for get*NetworkInfo on metered networks.
 2021-02-01 10:56:19 +00:00
Nicolas Geoffray
b86c3a3470 Merge "Support for showing percent progress in boot animation." am: 87d840addd 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1545805

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I64c03c5c85c216eb739e482eca267c1dadd3169b
 2021-02-01 10:26:21 +00:00
Nicolas Geoffray
87d840addd Merge "Support for showing percent progress in boot animation." 2021-02-01 09:51:30 +00:00
TreeHugger Robot
6564036dd7 Merge changes from topic "dmd_log_and_fix_rvc" into rvc-qpr-dev am: b72db4c52f 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13381993

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ic87f4b68581208c48f3ee229adf978aeaee1d09e
 2021-02-01 09:32:24 +00:00
raylinhsu
9471fe8d50 Added to enable/disable log for DisplayModeDirector am: f6247e3d30 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13372399

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I241ea5f3f2a05eefaed0f4e4a9c0488afe9437ee
 2021-02-01 09:32:03 +00:00
TreeHugger Robot
b72db4c52f Merge changes from topic "dmd_log_and_fix_rvc" into rvc-qpr-dev 
* changes:
  Fix ambient information which did not get for locking refresh rate
  Added to enable/disable log for DisplayModeDirector
 2021-02-01 08:47:45 +00:00
Remi NGUYEN VAN
546e2e895f Merge "Move module sources to packages/Connectivity" am: 3d70ab73eb am: 5acf0f78fb 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1552656

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I8261b01b976b4d8009cd028fa113ef8bede74acb
 2021-02-01 08:41:56 +00:00
Chalard Jean
8cb7e186cd Merge "Start VcnManagementService after ConnectivityService" am: 1595b1aa38 am: 356c6725c6 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1539845

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I6accd63f8570a944758596319689266837c1dc94
 2021-02-01 08:41:48 +00:00
Calvin Pan
a0927df3f1 Merge "Add TelephonyShellCommand to get EAB contact" am: d2d77dba7d am: e532d3be62 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1559096

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I8886623de1860bdf14584ff061bfdd808c043154
 2021-02-01 08:41:22 +00:00
Alex Buynytskyy
9f3cfe4c82 Merge "create owners" am: 00c3346e2d am: feaccc5be9 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1565113

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I4c1c38db1703bcb3eb3e51979dd78af723da9487
 2021-02-01 08:41:04 +00:00
Lorenzo Colitti
677fbbbedc Merge "Allow RNDIS and NCM to be enabled at the same time." am: 2836d8b703 am: 9db81cadec 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1559090

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ia7e6e4698f80bc70112e9338c5c5ff27cbd248ce
 2021-02-01 08:40:49 +00:00
Jakub Pawlowski
9dd3a7b6a0 Merge "resolve merge conflicts of 132a502721 to rvc-qpr-dev-plus-aosp" into rvc-qpr-dev-plus-aosp 2021-02-01 08:19:47 +00:00