Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
567,739 Commits 3 Branches 0 Tags
9c7ea4db8a49d833760a88a37732b5f402df73e7
Commit Graph

567739 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Paul Hu
9c7ea4db8a Merge "Remove hidden LinkProperties methods accesses" am: eed88a705d am: 65e6be618f 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1645287

Change-Id: Ib99ec3f77247d38f7e7c47898aa3e27ad2ed9a93
 2021-03-19 06:44:34 +00:00
Chalard Jean
37e8ecdb9a Merge "[NS02] Mix in validation of the score" am: 93a3f18a40 am: 5f96b8c585 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1556100

Change-Id: I9f628ce479db20f26a1ea1549ab11635613ccfa9
 2021-03-19 06:44:12 +00:00
Paul Hu
65e6be618f Merge "Remove hidden LinkProperties methods accesses" am: eed88a705d 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1645287

Change-Id: I84395bcab438908b898231b7a77927923dcb05ad
 2021-03-19 06:09:04 +00:00
Chalard Jean
5f96b8c585 Merge "[NS02] Mix in validation of the score" am: 93a3f18a40 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1556100

Change-Id: I229c3033a16d6b7f11f1b3f02351cc0d2153d199
 2021-03-19 06:05:28 +00:00
Paul Hu
eed88a705d Merge "Remove hidden LinkProperties methods accesses" 2021-03-19 05:52:08 +00:00
Chalard Jean
93a3f18a40 Merge "[NS02] Mix in validation of the score" 2021-03-19 05:39:40 +00:00
Treehugger Robot
281f77c93c Merge "CaptivePortalData: use CharSequence in VenueFriendlyName API" am: 47157e7711 am: 4bdea2a29b 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1640985

Change-Id: I5c04566c379e2cad164d55050ffdc9152432dfd3
 2021-03-19 05:27:46 +00:00
Chalard Jean
b5dbd7f46d [NS02] Mix in validation of the score 
Test: FrameworksNetTests FrameworksWifiTests NetworkStackTests
Change-Id: I9cac3a05ad0c4008599973b12d2c5e4c02233a5c
 2021-03-19 13:50:56 +09:00
Treehugger Robot
4bdea2a29b Merge "CaptivePortalData: use CharSequence in VenueFriendlyName API" am: 47157e7711 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1640985

Change-Id: I26db95ad9d91dec40a62b7e4c4c0b77133ddb5d3
 2021-03-19 04:42:53 +00:00
TreeHugger Robot
7c330732a1 [automerger skipped] Merge "TelephonyRegistry: Pass featureId to LocationAccessPolicy" into rvc-qpr-dev am: 1c9ac73a78 -s ours 
am skip reason: skip tag Change-Id I3a5afddfc151e06f5deb0220620bbd40849626c4 with SHA-1 951ceccfd7 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13896657

Change-Id: Idfbcc609fcab6c9f83cb91fc65c705dc0e761728
 2021-03-19 04:41:48 +00:00
TreeHugger Robot
1c9ac73a78 Merge "TelephonyRegistry: Pass featureId to LocationAccessPolicy" into rvc-qpr-dev 2021-03-19 04:16:53 +00:00
Treehugger Robot
47157e7711 Merge "CaptivePortalData: use CharSequence in VenueFriendlyName API" 2021-03-19 04:13:36 +00:00
Remi NGUYEN VAN
3e876a2147 Merge "Add TEST_NETWORK_SERVICE to module API" am: 7e26e33269 am: 6d208315f8 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1629260

Change-Id: I3cd53e2c9f9ed61153b083661ff0402cf1eb607b
 2021-03-19 03:44:03 +00:00
Remi NGUYEN VAN
6d208315f8 Merge "Add TEST_NETWORK_SERVICE to module API" am: 7e26e33269 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1629260

Change-Id: I78e28855dce5b38785ec60bf1c5489ebf2b98ded
 2021-03-19 03:07:53 +00:00
Remi NGUYEN VAN
7e26e33269 Merge "Add TEST_NETWORK_SERVICE to module API" 2021-03-19 02:32:00 +00:00
Paul Hu
7f507fe7fe Merge "Fix CS external dependencies on CarrierDefaultApp" am: 25be9509b8 am: e51271ca2f 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1644389

Change-Id: Ieef1ccfc59761bbd570c457ef126d7f3489d424f
 2021-03-19 02:26:45 +00:00
Chalard Jean
a7a1251b04 Merge "Check for FEATURE_TELEPHONY instead of CM" am: 6df94880b3 am: 318bbccc3e 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1639905

Change-Id: Idcb987bc2efef9fbbf947d5c7dc0630d7ad45ddc
 2021-03-19 02:26:22 +00:00
Paul Hu
e51271ca2f Merge "Fix CS external dependencies on CarrierDefaultApp" am: 25be9509b8 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1644389

Change-Id: Ia2d8822d0230fd93893399bc5a61c9af7a355139
 2021-03-19 01:50:44 +00:00
Chalard Jean
318bbccc3e Merge "Check for FEATURE_TELEPHONY instead of CM" am: 6df94880b3 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1639905

Change-Id: Ibf1b7ccf19781d8caa1bb27e335be2367a6fb658
 2021-03-19 01:46:23 +00:00
Paul Hu
25be9509b8 Merge "Fix CS external dependencies on CarrierDefaultApp" 2021-03-19 01:41:25 +00:00
Remi NGUYEN VAN
0afced9423 Merge "Add InetAddressCompat" am: b648508ccb am: 23511a3eba 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1645289

Change-Id: I94fef501699aa01c997a03dd24a5a25442075af1
 2021-03-19 01:10:06 +00:00
Remi NGUYEN VAN
73d3166547 Merge "Move network selection utils to Connectivity" am: c9f553c7ed am: 295bcd9be7 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1645291

Change-Id: Ia276fc1988baf3240f120682170d6c41ee01839e
 2021-03-19 01:09:30 +00:00
Treehugger Robot
6f06dae1c3 Merge "Keystore 2.0: Fix diagnosing invalid key in CipherSpiBase." am: be1b1d5550 am: 1ade004e0f 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1646146

Change-Id: Ibf882ed499ada52633ce22b88c1af931f9064ce3
 2021-03-19 01:08:39 +00:00
Chalard Jean
6df94880b3 Merge "Check for FEATURE_TELEPHONY instead of CM" 2021-03-19 00:59:04 +00:00
Remi NGUYEN VAN
23511a3eba Merge "Add InetAddressCompat" am: b648508ccb 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1645289

Change-Id: I6946ca309ae923a637f5e5f0ad73c91b26b3c376
 2021-03-19 00:39:34 +00:00
Remi NGUYEN VAN
295bcd9be7 Merge "Move network selection utils to Connectivity" am: c9f553c7ed 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1645291

Change-Id: I452591707a97b501f189fa9f61e90da842fa3734
 2021-03-19 00:35:03 +00:00
Treehugger Robot
1ade004e0f Merge "Keystore 2.0: Fix diagnosing invalid key in CipherSpiBase." am: be1b1d5550 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1646146

Change-Id: Id4280de7e3f6f6693e0d03c901f4e9665803b92b
 2021-03-19 00:31:59 +00:00
Remi NGUYEN VAN
2bf4c58ceb Add TEST_NETWORK_SERVICE to module API 
TestNetworkManager is being unbundled; the TEST_NETWORK_SERVICE constant
is necessary for the module to register the manager with
registerContextAwareService.

Bug: 171540887
Test: m
Change-Id: I0690251ddfcdaa8a34830e110b75869a370de389
Merged-In: I0690251ddfcdaa8a34830e110b75869a370de389
 2021-03-19 00:04:24 +00:00
Remi NGUYEN VAN
b648508ccb Merge "Add InetAddressCompat" 2021-03-18 23:58:16 +00:00
Remi NGUYEN VAN
c9f553c7ed Merge "Move network selection utils to Connectivity" 2021-03-18 23:57:34 +00:00
Treehugger Robot
be1b1d5550 Merge "Keystore 2.0: Fix diagnosing invalid key in CipherSpiBase." 2021-03-18 23:46:37 +00:00
Treehugger Robot
d27fb1090a Merge "Keystore 2.0: No longer install the legacy provider." am: e72a7b4f1b am: 02ee21ec65 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1645706

Change-Id: Iefd5dc2e56ab8976b9f95db88340bd0cc705cd73
 2021-03-18 22:46:41 +00:00
Kai Shi
1224d2650b Merge "Add the LCE system API" am: 26ba4d0d09 am: 855075a2c2 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1643471

Change-Id: I19a67dc2479548452f96c82e91c2a236ffbbf8ad
 2021-03-18 22:46:08 +00:00
Amit Mahajan
f36b5ff898 Merge "Clarifying documentation for SliceInfo per API council feedback." am: afb77c6f83 am: ddc8641c01 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1642743

Change-Id: I7d19ab42485cf0e119efddf1ae98e7a298a3af64
 2021-03-18 22:44:53 +00:00
Mohammad Islam
4825a02c11 Merge "Append root cause with error message while parsing APEX" am: 411f31c83b am: 227d69ec89 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1642324

Change-Id: I194330580413eeb39e6763646d1083557a7eb48d
 2021-03-18 22:43:08 +00:00
Treehugger Robot
02ee21ec65 Merge "Keystore 2.0: No longer install the legacy provider." am: e72a7b4f1b 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1645706

Change-Id: I41d0972b8ef08cb4d305728940c4ea06d918de08
 2021-03-18 22:30:25 +00:00
Kai Shi
855075a2c2 Merge "Add the LCE system API" am: 26ba4d0d09 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1643471

Change-Id: I43c9fded561263a22231a68e39a4a1e6356805c5
 2021-03-18 22:20:31 +00:00
Amit Mahajan
ddc8641c01 Merge "Clarifying documentation for SliceInfo per API council feedback." am: afb77c6f83 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1642743

Change-Id: Ib2edeef2aa412cd076b50fe05cfbd15000159803
 2021-03-18 22:14:37 +00:00
Mohammad Islam
227d69ec89 Merge "Append root cause with error message while parsing APEX" am: 411f31c83b 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1642324

Change-Id: I20081011e279f31ac84fe657c9d569f6b00db253
 2021-03-18 21:56:52 +00:00
TreeHugger Robot
be26ce76b7 Merge "Fix an NPE in BatteryService" into rvc-qpr-dev am: 2b534bde0e 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13856050

Change-Id: I5086c0425b71654ac2115ce8f504ee65a5715766
 2021-03-18 21:56:23 +00:00
Treehugger Robot
e72a7b4f1b Merge "Keystore 2.0: No longer install the legacy provider." 2021-03-18 21:38:17 +00:00
Kai Shi
26ba4d0d09 Merge "Add the LCE system API" 2021-03-18 21:23:34 +00:00
Janis Danisevskis
0b66a19bdd Keystore 2.0: No longer install the legacy provider. 
The legacy provider is obsolete now that all calling code has
been fixed.

Bug: 183100147
Bug: 183093711
Bug: 171305684
Test: N/A
Merged-In: I0d71d3c9cdd586a508827eb26120c872cb8643ea
Change-Id: I0d71d3c9cdd586a508827eb26120c872cb8643ea
 2021-03-18 20:24:39 +00:00
TreeHugger Robot
2b534bde0e Merge "Fix an NPE in BatteryService" into rvc-qpr-dev 2021-03-18 20:10:12 +00:00
Amit Mahajan
afb77c6f83 Merge "Clarifying documentation for SliceInfo per API council feedback." 2021-03-18 19:55:52 +00:00
Janis Danisevskis
0b858aef63 Keystore 2.0: Fix diagnosing invalid key in CipherSpiBase. 
Bug: 183101158
Test: atest CtsLibcoreTestCases:com.android.org.conscrypt.javax.crypto.CipherBasicsTest#testAeadEncryption

Merged-In: Idc9c7dc2614a47818227a06fe76078f72c0c1f57
Change-Id: Idc9c7dc2614a47818227a06fe76078f72c0c1f57
 2021-03-18 19:41:56 +00:00
Mohammad Islam
411f31c83b Merge "Append root cause with error message while parsing APEX" 2021-03-18 19:15:13 +00:00
Benedict Wong
cf2a7d9324 Merge "Hide required underlying caps APIs" am: d4b7104f7b am: ead4d8c3b4 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1634485

Change-Id: I9553f0fcff08432531261cb7bd252eff33f71b11
 2021-03-18 17:26:58 +00:00
Anthony Stange
a1ffcbd57f [automerger skipped] Merge "Revert "Add an API to listen for changes in network blocked status of an uid."" am: 677f4420b9 -s ours am: 45031cd16a -s ours 
am skip reason: skip tag Change-Id Ib9949b8619c6b148f73630b314c4113d76c31ec1 with SHA-1 7dc302d612 is already in history

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1645826

Change-Id: If86357ec4e47c2de55377d84a44738f341d220bc
 2021-03-18 17:26:47 +00:00
Anthony Stange
ed172af621 Merge changes from topic "revert-1626206-replaceUidRange-MSYTKFNGUE" am: 0442fab063 am: 07e22a0fd6 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1645768

Change-Id: Ic7f04ad2af282654f5a57c9e25e8dad9b78f114c
 2021-03-18 17:26:18 +00:00