Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
565,695 Commits 3 Branches 0 Tags
ee705dfe0ceb59d46bde79915e8919bfba600647
Commit Graph

565695 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Frank Li
ee705dfe0c Merge "[CS15]Do not use hidden API of PlatformProperties" am: ed60cc949b 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1623261

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I623fd33e756f9ada6b73f716a30778fd6236f6ae
 2021-03-15 08:42:02 +00:00
Frank Li
ed60cc949b Merge "[CS15]Do not use hidden API of PlatformProperties" 2021-03-15 08:01:26 +00:00
Remi NGUYEN VAN
4ac52e881c Merge "Revert "Remove connectivity dependency on Preconditions"" am: 84319f2fe0 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1635220

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I7dbcb1e49162210b44bd0cf2204b853c34bb5871
 2021-03-15 07:44:21 +00:00
Remi NGUYEN VAN
84319f2fe0 Merge "Revert "Remove connectivity dependency on Preconditions"" 2021-03-15 07:30:20 +00:00
Remi NGUYEN VAN
fad59e1d7f Revert "Remove connectivity dependency on Preconditions" 
This reverts commit d012890149.

Reason for revert: Build broken: b/182721112

Change-Id: Ibc84ec6d7900fdcf0bc14cd7036f9c08287711db
 2021-03-15 07:27:44 +00:00
Paul Hu
7e0396815e Merge "Replace InetAddress#parseNumericAddress" am: 1f6851f66a 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1614980

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I8f1112eef6086798a6f089dde2f297828c0b4f2e
 2021-03-15 07:06:12 +00:00
Paul Hu
1f6851f66a Merge "Replace InetAddress#parseNumericAddress" 2021-03-15 07:03:46 +00:00
Remi NGUYEN VAN
2d64bcbd09 Merge "Remove connectivity dependency on Preconditions" am: 644a489011 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1628399

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I3c0c2572ff84a2b163fb2e4e0f3e2cfec043313d
 2021-03-15 07:03:36 +00:00
Remi NGUYEN VAN
644a489011 Merge "Remove connectivity dependency on Preconditions" 2021-03-15 06:36:15 +00:00
lifr
2dea00a288 [CS15]Do not use hidden API of PlatformProperties 
ConnectivityService is going to become a mainline module, and
it will not able to use hidden method anymore. Using PlatformProperties
as a static library instead of hidden API.

Bug: 170917042
Test: atest FrameworksNetTests
Merged-In: I3a3deca5d2e0f690db8c0061de2db2217376d268
Change-Id: I3a3deca5d2e0f690db8c0061de2db2217376d268
 2021-03-15 14:14:18 +08:00
Sooraj Sasindran
0c2d670abd Merge "Allow REQUEST_NOT_SUPPORTED for nr dual connectivity config" am: 58489d1d48 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1632120

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ifbb8e522bd6ec1f750a988e1a9e0c2f7a823a0d8
 2021-03-15 05:22:32 +00:00
Sooraj Sasindran
58489d1d48 Merge "Allow REQUEST_NOT_SUPPORTED for nr dual connectivity config" 2021-03-15 04:38:24 +00:00
Remi NGUYEN VAN
6d573604b0 Merge "Remove VpnType usage in VpnTransportInfo" am: 3ce3d9f33d 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1629273

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I41431bfba97a6fe0678b9a5dc72b19479d5d4c66
 2021-03-15 02:07:39 +00:00
Remi NGUYEN VAN
fff4d3006c Merge "Create a service-connectivity-pre-jarjar library" am: c538773be1 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1625866

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I17ca508f3da731404306d6e65e9743120a7e0860
 2021-03-15 02:05:41 +00:00
Remi NGUYEN VAN
3ce3d9f33d Merge "Remove VpnType usage in VpnTransportInfo" 2021-03-15 01:52:30 +00:00
Remi NGUYEN VAN
c538773be1 Merge "Create a service-connectivity-pre-jarjar library" 2021-03-15 01:32:47 +00:00
Treehugger Robot
04b996abf6 Merge "Binder: disambiguate unlinkToDeath error" am: 4600169731 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1634659

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Id5363cdd0c0daadfcc326aa7688aa030703242a2
 2021-03-13 02:03:33 +00:00
Treehugger Robot
4600169731 Merge "Binder: disambiguate unlinkToDeath error" 2021-03-13 01:29:09 +00:00
Treehugger Robot
8213112805 Merge "Add OWNERS for BatteryService" am: 02d23fe577 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1634479

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ibd092780ecba7577d623110d1aceb04371f2c58a
 2021-03-12 23:52:06 +00:00
James Lin
49a01d8a45 Merge "UCE API change: Remove the unused RCS UCE APIs" am: 29c9a7a937 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1629268

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I91aa2ee57554f1d3845b3f2d3d1964aeb018149b
 2021-03-12 23:44:27 +00:00
Treehugger Robot
02d23fe577 Merge "Add OWNERS for BatteryService" 2021-03-12 23:13:41 +00:00
James Lin
29c9a7a937 Merge "UCE API change: Remove the unused RCS UCE APIs" 2021-03-12 23:10:44 +00:00
Treehugger Robot
4f20a977b8 Merge changes from topic "uwb_api_change" am: 17cc39f7d8 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1573331

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I32b4dfd43f457eadf4344995dbea65a42fcf1798
 2021-03-12 22:24:37 +00:00
Brian Stack
bc33456cde Return CancellationSignal when opening UWB session am: 23d41b8f0f 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1595754

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I762874c5de98f344cb5b78740648a2b5edd371ba
 2021-03-12 22:20:22 +00:00
Brian Stack
f2cb4dfadd Address UWB API feedback am: 78bce9af5b 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1600815

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ib002fee72141f14ac56285152abe758978d1abf0
 2021-03-12 22:16:27 +00:00
Cody Kesting
8424914179 Merge "Update Policy Listener API naming." am: a93e2f9545 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1629359

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I83623e00d40a388b4c4534139a11990937514141
 2021-03-12 22:08:29 +00:00
Treehugger Robot
17cc39f7d8 Merge changes from topic "uwb_api_change" 
* changes:
  Pass SessionHandle to UWB Service when opening a session
  Return CancellationSignal when opening UWB session
  Address UWB API feedback
 2021-03-12 21:50:17 +00:00
Sooraj Sasindran
d3b3e00a05 Allow REQUEST_NOT_SUPPORTED for nr dual connectivity config 
Allow REQUEST_NOT_SUPPORTED for nr dual connectivity configuration
and query

Bug: 181648176
Test: CTS with presubmit
Change-Id: Ib10dcc083d9aae7b905aa008dff05d2975865c71
 2021-03-12 13:43:21 -08:00
Cody Kesting
a93e2f9545 Merge "Update Policy Listener API naming." 2021-03-12 21:32:08 +00:00
Steven Moreland
ffaac1c2d3 Binder: disambiguate unlinkToDeath error 
BpBinder may return OK, DEAD_OBJECT, or NAME_NOT_FOUND for this
operation, but BBinder returns INVALID_OPERATION, and subclasses may
return other errors. In at least one bug, the resolution of this
ambiguity would help direct debugging.

Bug: 180891878
Test: N/A

Change-Id: I109a09788d3075e7c594445a6f3649ade109b5c2
 2021-03-12 21:18:30 +00:00
Brad Ebinger
71b59ace5a Merge "Add a new Config to map PIDF service-description to IMS Feature Tags" am: 3db11be5d7 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1621649

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Id6c5c084e8897ccc8c589bdc135db589e81fee16
 2021-03-12 20:15:56 +00:00
Jagadeesh Pakaravoor
876927e795 Merge "Add madvising of .odex, .vdex and .art files" am: fcf61e805a 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1611231

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I1ca142cfa6bed60d8a0fec2156c689222cdfeb1a
 2021-03-12 20:07:53 +00:00
Dmitri Plotnikov
46972a6f35 Add OWNERS for BatteryService 
Test: N/A
Change-Id: Ic7c9ed6d5d829d407ac7ad2a2313ec8fe8442374
 2021-03-12 11:48:49 -08:00
Brad Ebinger
3db11be5d7 Merge "Add a new Config to map PIDF service-description to IMS Feature Tags" 2021-03-12 19:30:30 +00:00
Jagadeesh Pakaravoor
fcf61e805a Merge "Add madvising of .odex, .vdex and .art files" 2021-03-12 19:30:02 +00:00
Hui Wang
d57ee0764d Merge "Add onPreProvisioningRecevied to RcsProvisioningCallback" am: f395f2dd4b 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1629520

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I39569c6bb7bdbdedf7182a7bb732d569761ff0e6
 2021-03-12 18:42:55 +00:00
Hui Wang
d783f90b6d Merge "Make the doc of bootstrapAuthenticationRequest more accurate" am: 14d654f998 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1629521

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I0f906612bfe94da792139601dd7ce9d2280f4d67
 2021-03-12 18:32:33 +00:00
Hui Wang
f395f2dd4b Merge "Add onPreProvisioningRecevied to RcsProvisioningCallback" 2021-03-12 18:22:52 +00:00
Hui Wang
14d654f998 Merge "Make the doc of bootstrapAuthenticationRequest more accurate" 2021-03-12 18:17:43 +00:00
Andy Hung
fa59a51450 Merge "SoundPool: Fix clang-tidy" am: c337968e03 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1625766

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I5acdc2ebaa54865f48589fb3cfc41e77a7b76dc1
 2021-03-12 18:14:28 +00:00
Andy Hung
c337968e03 Merge "SoundPool: Fix clang-tidy" 2021-03-12 17:39:42 +00:00
Hasini Gunasinghe
181ffb4bec Merge "Keystore2: Integrate getState method of IKeystoreMaintenance AIDL." am: 11e324829e 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1630059

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ie9e2b82448ca1c0deb1339acee034933039cd711
 2021-03-12 17:16:30 +00:00
Hasini Gunasinghe
11e324829e Merge "Keystore2: Integrate getState method of IKeystoreMaintenance AIDL." 2021-03-12 16:30:58 +00:00
Andrei-Valentin Onea
086acc1ba8 Merge changes Idd7d86f9,I73569744 am: 420476e0cd 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1532338

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I0a5605574dd5126717f879b2dd367861cc35c215
 2021-03-12 14:05:58 +00:00
tomnatan
b470b0d67e Add support for loading a static overrides file located in /product. am: ed60ceba22 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1614848

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I3194eee0ac82c6bb3b579ce297437d48cfcc854e
 2021-03-12 14:03:45 +00:00
Andrei-Valentin Onea
420476e0cd Merge changes Idd7d86f9,I73569744 
* changes:
  Do not enable changes newer than the current sdk
  Add support for loading a static overrides file located in /product.
 2021-03-12 13:28:50 +00:00
Nicolas Geoffray
5f117b3491 Merge "Remove some methods from DdmVmInternal." am: af174a5708 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1549965

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I311a25be21589b452094c1929ad9b695d1eb419f
 2021-03-12 12:45:27 +00:00
Nicolas Geoffray
af174a5708 Merge "Remove some methods from DdmVmInternal." 2021-03-12 12:05:45 +00:00
paulhu
033521c57b Replace InetAddress#parseNumericAddress 
-Connectivity is becoming a mainline module in S but mainline
modules are not allowed to use non-formal APIs. Thus, replace
non-formal API InetAddress#parseNumericAddress to
InetAddresses#parseNumericAddress.
- Add deprecated method legacyParseIpAndMask() for IpPrefix and
LinkAddress. Because InetAddresses#parseNumericAddress has
a little different behavior in some case, but these two classes
should keep working as before. So these two classes will use
the new deprecated method.

Bug: 181756157
Test: FrameworksNetTests
Change-Id: I1c96b75f0b8d5e93304a39b4a8c8849964e5e810
 2021-03-12 19:57:40 +08:00
Dorin Drimus
ce25438e38 Merge "Improve some External Storage Notification texts on TVs" am: 894c63654d 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1621095

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I46b14ea01ba656b112f0790c8b0ff758a4049585
 2021-03-12 10:39:19 +00:00