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

564194 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Andrei-Valentin Onea
40071fa8e8 Merge "Persist compat framework overrides across reboot" am: 51164692d0 am: e153c16320 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1535144

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ic057657bde7cfa45bad200d5e1a06330e650a2d4
 2021-01-27 21:53:30 +00:00
Benedict Wong
ef9733a9c9 Merge "Implement DisconnectingState" am: 2cfb250d6d am: d3b37546db 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1547274

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Iddeef57b3711591bd436f041ac0ce08971f93a26
 2021-01-27 21:53:15 +00:00
Andrei-Valentin Onea
e153c16320 Merge "Persist compat framework overrides across reboot" am: 51164692d0 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1535144

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I1b63f99caa3c384b994ea043c032b59a18a210de
 2021-01-27 18:53:52 +00:00
Benedict Wong
d3b37546db Merge "Implement DisconnectingState" am: 2cfb250d6d 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1547274

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I265cfe4d4cd4a2b8f13bd18e71baf7d18e144d03
 2021-01-27 18:41:41 +00:00
Andrei-Valentin Onea
51164692d0 Merge "Persist compat framework overrides across reboot" 2021-01-27 18:17:11 +00:00
Benedict Wong
2cfb250d6d Merge "Implement DisconnectingState" 2021-01-27 18:13:10 +00:00
Treehugger Robot
16f762211e Merge "Watchdog: Rename properties to follow guidelines" am: 62bdf8c076 am: cb24b18b50 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1560493

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I8c21124ca258bcfc6f968a25fa27f408d4213970
 2021-01-27 16:48:42 +00:00
Treehugger Robot
cb24b18b50 Merge "Watchdog: Rename properties to follow guidelines" am: 62bdf8c076 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1560493

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I50a67a9f9244e5d5f16b186a8f993baf8303c236
 2021-01-27 16:11:18 +00:00
Treehugger Robot
62bdf8c076 Merge "Watchdog: Rename properties to follow guidelines" 2021-01-27 15:43:17 +00:00
Woody Lin
bc8d470970 Watchdog: Rename properties to follow guidelines 
Bug: 141948707
Bug: 178498518
Change-Id: Iefbeae8da80308be148610dc87d20553a290f4c5
 2021-01-27 21:57:53 +08:00
Jeff DeCew
d64f05737b Merge "Add 'Android Resources' team as OWNERS of classes in android.util" am: 6671f75e1d am: ce917a8f14 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1542391

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ic86ad6333992c464f544d679ff8b138e175c2643
 2021-01-27 13:57:47 +00:00
Treehugger Robot
046ebf41b7 Merge "[FUI03] No-op refactoring of VpnInfo" am: f9dbe61693 am: b0989fd2d2 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1547637

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ic947ae7aabd4e0095e94977dffb66c2f6b7b9e57
 2021-01-27 13:57:34 +00:00
Jeff DeCew
ce917a8f14 Merge "Add 'Android Resources' team as OWNERS of classes in android.util" am: 6671f75e1d 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1542391

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I8179b0b4136d9b7665a8fe270872b92dccac9231
 2021-01-27 13:33:35 +00:00
Jeff DeCew
6671f75e1d Merge "Add 'Android Resources' team as OWNERS of classes in android.util" 2021-01-27 13:18:49 +00:00
Treehugger Robot
b0989fd2d2 Merge "[FUI03] No-op refactoring of VpnInfo" am: f9dbe61693 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1547637

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Iae15ffcf1fbf31ab004a36eb662f39e4439146d0
 2021-01-27 13:11:28 +00:00
Treehugger Robot
f9dbe61693 Merge "[FUI03] No-op refactoring of VpnInfo" 2021-01-27 11:47:34 +00:00
Howard Chen
3b3dd247cd Merge "Refine the DSU SD card support" am: da932b4a45 am: adf0f11de8 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1540921

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Iaff78c43d6bb00ce8e2130edab9f4537dd18ad31
 2021-01-27 09:49:43 +00:00
Howard Chen
adf0f11de8 Merge "Refine the DSU SD card support" am: da932b4a45 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1540921

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I2fb1cea8aa1b83ee9218cfca9f88c02d3607ff4b
 2021-01-27 09:14:43 +00:00
Howard Chen
da932b4a45 Merge "Refine the DSU SD card support" 2021-01-27 08:40:34 +00:00
Remi NGUYEN VAN
b0247948ef Merge "Move connectivity-sources to frameworks/base" am: d9f9d4a5d5 am: 4fff0be65e 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1552065

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I086ea4d13012e89a9ab9c006107fc24cbcb33db9
 2021-01-27 08:27:55 +00:00
Remi NGUYEN VAN
4fff0be65e Merge "Move connectivity-sources to frameworks/base" am: d9f9d4a5d5 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1552065

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I5839df398fe834f527c2ed4732220592be1762ab
 2021-01-27 07:50:14 +00:00
Remi NGUYEN VAN
d9f9d4a5d5 Merge "Move connectivity-sources to frameworks/base" 2021-01-27 07:15:05 +00:00
junyulai
fa528b2d20 [FUI03] No-op refactoring of VpnInfo 
As a preparation of exposing system API. This patch does some
harmless refactoring, which includes:
  1. Move VpnInfo to android.net
  2. Add nullability annotations
  3. Make members final

Bug: 174123988
Test: TH
Change-Id: I1530bb45d0e84c28c6deac33596bc686058afc0d
 2021-01-27 15:03:06 +08:00
Treehugger Robot
2461dcf65f Merge "Keystore 2.0 SPI Small doc comment fixup." am: 37356f4149 am: 1d4d6f4caa 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1561316

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I2e13b3a668afb12703b02e9418627dedac3c361a
 2021-01-27 05:46:03 +00:00
James Mattis
b214f23e61 Merge changes Ic67cff95,Id7a6175c,I3d6896f5,Iaff727e7 am: 96ccce1940 am: 7329e83d2f 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1527006

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: If95476bce2e340fb95a64f314ba0fef420f14294
 2021-01-27 05:45:23 +00:00
Chiachang Wang
14dfb0cfe7 Merge "Expose UdpEncapsulationSocket.getResourceId()" am: 8dc248c84a am: 18896c83ed 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1547642

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ie79141820782688b8705cf0edc59cf7a60c74f13
 2021-01-27 05:45:07 +00:00
Treehugger Robot
1d4d6f4caa Merge "Keystore 2.0 SPI Small doc comment fixup." am: 37356f4149 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1561316

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ic74316cd0d5b5f2a13fb629e7b40a81045348c65
 2021-01-27 05:36:21 +00:00
James Mattis
7329e83d2f Merge changes Ic67cff95,Id7a6175c,I3d6896f5,Iaff727e7 am: 96ccce1940 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1527006

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I88af6ecc2d8cb7695029504b842e08d622f3d2ed
 2021-01-27 05:33:07 +00:00
Chiachang Wang
18896c83ed Merge "Expose UdpEncapsulationSocket.getResourceId()" am: 8dc248c84a 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1547642

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Iabe3fe4ab7fcad9e8c3f7ad89a49d3d5b1a874ce
 2021-01-27 05:22:15 +00:00
Treehugger Robot
37356f4149 Merge "Keystore 2.0 SPI Small doc comment fixup." 2021-01-27 05:00:40 +00:00
James Mattis
96ccce1940 Merge changes Ic67cff95,Id7a6175c,I3d6896f5,Iaff727e7 
* changes:
  Updates to handler logic for multilayer requests
  Update to sendAllRequestsToProvider for Multilayer
  Multilayer request updates to request callbacks
  Multilayer support when NAI requests are updated
 2021-01-27 04:50:43 +00:00
Chiachang Wang
8dc248c84a Merge "Expose UdpEncapsulationSocket.getResourceId()" 2021-01-27 04:41:18 +00:00
Chiachang Wang
54e430d69a Merge "Update jni to get int descriptor in native layer" am: 1bd8cd59a5 am: e1874186ba 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1553967

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I4415671e964346ea31844d0a7ed65459ffe338b2
 2021-01-27 03:38:00 +00:00
Benedict Wong
78e931383c Merge "Prep VCN files for exposing APIs" am: f0aa57318d am: 278b748966 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1554718

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Idfc5997add6879408a4837fa8d0317af0cacba8b
 2021-01-27 03:14:27 +00:00
Treehugger Robot
476343a40c Merge changes I8fffd952,Ief6690bb am: b4203793bf am: d16fff5b00 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1550435

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ib8061fa36103f233e5f06d3a60e8f0e734fc0b0f
 2021-01-27 03:14:13 +00:00
Chiachang Wang
e1874186ba Merge "Update jni to get int descriptor in native layer" am: 1bd8cd59a5 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1553967

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ifd8dbb868577eb071f950c7e9afb25b929e9441c
 2021-01-27 03:10:44 +00:00
Benedict Wong
278b748966 Merge "Prep VCN files for exposing APIs" am: f0aa57318d 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1554718

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I2e2313b1c5a19f0bb218a15f6708f23288434a5b
 2021-01-27 02:48:55 +00:00
Treehugger Robot
d16fff5b00 Merge changes I8fffd952,Ief6690bb am: b4203793bf 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1550435

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I7a3d4db0692b9266992386916bbae57b360e703f
 2021-01-27 02:45:39 +00:00
James Mattis
0985f94623 Updates to handler logic for multilayer requests 
Updates to ConnectivityService network request handler's logic to support
(or disallow support of) multilayer network requests.

Bug: 175239920
Bug: 171991028
Test: atest FrameworksNetTests
atest NetworkStackTests
atest FrameworksNetIntegrationTests
atest NetworkStackIntegrationTests
atest CtsNetTestCasesLatestSdk

Change-Id: Ic67cff950d72745d6508a0a037bd33f932d5132c
 2021-01-26 18:44:45 -08:00
James Mattis
46ac053990 Update to sendAllRequestsToProvider for Multilayer 
Updates to ConnectivityService.sendAllRequestsToProvider to support
Multilayer requests.

Bug: 175051182
Bug: 171991028
Test: atest FrameworksNetTests
atest FrameworksNetIntegrationTests
atest CtsNetTestCasesLatestSdk

Change-Id: Id7a6175cee28d2de1f6194cd0fc8c739d667427d
 2021-01-26 18:44:32 -08:00
Chiachang Wang
1bd8cd59a5 Merge "Update jni to get int descriptor in native layer" 2021-01-27 02:44:29 +00:00
Chiachang Wang
db2cec6024 Update jni to get int descriptor in native layer 
ConnectivityService is going to become a mainline module which
can not access the hidden APIs. The int descriptor of a
FileDescriptor is hidden for internal use only. The Network and
NetworkUtls will be parts of CS module. The corresponding usage
should be removed. There is no way in a module to access the
descriptor, so update the jni to set a FileDescriptor to native
to get the int descriptor inside the platform.

Also, update the other references in android_net_NetUtils for
getting fd to use the NDK functions in the libnativehelper.

Bug: 170598012
Test: atest FrameworksNetTests CtsNetTestCasesLatestSdk
Test: manually connect to a VPN
Change-Id: I2143c079feac53917a6e7bf7422f3180f51437fb
 2021-01-27 02:44:14 +00:00
Benedict Wong
f0aa57318d Merge "Prep VCN files for exposing APIs" 2021-01-27 02:34:09 +00:00
Treehugger Robot
b4203793bf Merge changes I8fffd952,Ief6690bb 
* changes:
  Add shell commands for app hibernation service
  Add basic hibernation state management
 2021-01-27 01:36:43 +00:00
Chiachang Wang
5e26cc8c56 Expose UdpEncapsulationSocket.getResourceId() 
ConnectivityManager.createSocketKeepalive() will need to get
the socket resource ID as a parameter for creating a new
NattSocketKeepalive. ConnectivityManager is a part of incoming
ConnectivityService mainline, so expose getResourceId() as an
API since the hidden APIs are not accessible for a mainline
module. This API should not be exposed to apps, so make it a
MODULE_LIBRARIES system API.

Bug: 172183305
Test: make update-api
Change-Id: Ic0722352ea186fcb18a2d91cc3969f771fde9e86
 2021-01-27 09:27:26 +08:00
Paul Hu
8107226e38 Merge "Fix FrameworksNetIntegrationTests failure" am: 5d496eb9b3 am: d8d1d3e2b3 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1559105

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ib4172f2b4eaec4f154bc8092531638cea3526d5f
 2021-01-27 01:01:39 +00:00
Paul Hu
3739eed0ce Merge "Revert^2 "Replace Context#sendStickyBroadcastAsUser()"" am: 742ec924e8 am: 57084714d4 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1556143

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I12d09faf926b513cd4f3db21703a673f8bd832bf
 2021-01-27 01:01:37 +00:00
Janis Danisevskis
e553efeb7a Keystore 2.0 SPI Small doc comment fixup. 
Test: N/A
Change-Id: Ia54b912092431569cac64e228b902abd6383f728
 2021-01-26 16:49:16 -08:00
Paul Hu
d8d1d3e2b3 Merge "Fix FrameworksNetIntegrationTests failure" am: 5d496eb9b3 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1559105

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I2e43ec9f2061e4a67c5d78a3cab331ed8b13b991
 2021-01-27 00:38:32 +00:00
Paul Hu
57084714d4 Merge "Revert^2 "Replace Context#sendStickyBroadcastAsUser()"" am: 742ec924e8 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1556143

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I0bd4c977d13d2328cab480ca27c59de6fc4856a6
 2021-01-27 00:33:36 +00:00