Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
636,382 Commits 3 Branches 0 Tags
ecd46961ba4f207392f250be0bfb5dc342fefbe5
Commit Graph

11045 Commits

Author SHA1 Message Date
Jeff DeCew
53cd202258 Merge "Remove Notification.DevFlags" into sc-dev am: e2d38c5ac5 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13924938

Change-Id: I9c234f756e08abb64432e31e4144c93b03b7785b
 2021-03-24 01:07:41 +00:00
Cody Kesting
31703d8261 Merge changes from topic "vcn-status-changed" am: 46c10cbc4d am: c74b9c7ac9 am: c33747c5f0 am: 44f9647832 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1633026

Change-Id: I28d2229ce0af500c5999cd6cb238aa261613b1b2
 2021-03-24 01:06:17 +00:00
Cody Kesting
6f10838210 Reevaluate VcnGatewayConnections on receiving new configs. am: 3a51a7d152 am: 7af706d57d am: e36f979abe am: abbe45f721 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1626326

Change-Id: I031e9ad00cada8e64dfb9d7188233a47504c7fda
 2021-03-24 01:06:11 +00:00
Jeff DeCew
e2d38c5ac5 Merge "Remove Notification.DevFlags" into sc-dev 2021-03-23 19:50:27 +00:00
Cody Kesting
44f9647832 Merge changes from topic "vcn-status-changed" am: 46c10cbc4d am: c74b9c7ac9 am: c33747c5f0 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1633026

Change-Id: I237022fee3667824736e222dad64d8528fe0b699
 2021-03-23 19:34:37 +00:00
Cody Kesting
abbe45f721 Reevaluate VcnGatewayConnections on receiving new configs. am: 3a51a7d152 am: 7af706d57d am: e36f979abe 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1626326

Change-Id: Ic4036a75c5fed641993eed2108e3a00c21981567
 2021-03-23 19:34:20 +00:00
Cody Kesting
7af706d57d Reevaluate VcnGatewayConnections on receiving new configs. am: 3a51a7d152 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1626326

Change-Id: Ifb0216369b5b92b9cfbf2425c80a16afbf23b1fb
 2021-03-23 17:53:12 +00:00
Cody Kesting
46c10cbc4d Merge changes from topic "vcn-status-changed" 
* changes:
  Rename VcnStatusCallback#onVcnStatusChanged.
  Reevaluate VcnGatewayConnections on receiving new configs.
 2021-03-23 17:10:51 +00:00
Chiachang Wang
b1d9f48303 Merge "Correct the logic in NetworkCapabilitiesTest" am: 457f91decf am: 885aad17b5 am: 008ba7a698 am: 063d3b25fc 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1649297

Change-Id: If8264d339b93311240fce3875b41592efa336ad1
 2021-03-23 14:40:19 +00:00
Lorenzo Colitti
7c82c55bfa Merge changes I638ed5cd,I29f15571,I21a22ed1 am: 892589c514 am: 3df38d48ae am: 114c3e3038 am: 915460fff3 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1648068

Change-Id: Icde67fc03c99a80d22b58458a8ae515222939a6e
 2021-03-23 14:35:19 +00:00
Chiachang Wang
063d3b25fc Merge "Correct the logic in NetworkCapabilitiesTest" am: 457f91decf am: 885aad17b5 am: 008ba7a698 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1649297

Change-Id: I3a99cab2dc0bdaa88a9671e1978c29cb40cd7a5b
 2021-03-23 14:09:30 +00:00
Lorenzo Colitti
915460fff3 Merge changes I638ed5cd,I29f15571,I21a22ed1 am: 892589c514 am: 3df38d48ae am: 114c3e3038 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1648068

Change-Id: I6d897cdcfb5b0e4809a32312071eb77623754f94
 2021-03-23 14:01:19 +00:00
Jeff DeCew
8548f343e2 Remove Notification.DevFlags 
Fixes: 176239013
Test: manual
Change-Id: I1aeed1c79e4a829d8829eb08224f9b21fafc50fe
 2021-03-23 13:28:55 +00:00
Jeff Sharkey
cbdf88ce58 Merge changes from topic "nearby-bluetooth-permission-group" into sc-dev am: 9f5392e8b7 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13956893

Change-Id: Idef7bb2a70ff9a5f0c4eff73ccbdc6e2bae02259
 2021-03-23 13:10:54 +00:00
Aaron Huang
75dff149bb Merge "Move deduceRestrictedCapability to libs/net and rename it" into sc-dev am: 68d118e3c6 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13921626

Change-Id: I9650af9e6d018298a81804fdf26e2135fd09b4b1
 2021-03-23 13:09:40 +00:00
Jeff Sharkey
9f5392e8b7 Merge changes from topic "nearby-bluetooth-permission-group" into sc-dev 
* changes:
  Request new Bluetooth runtime permissions.
  Default grants for "Nearby devices" permission.
  Add BLUETOOTH_SCAN and BLUETOOTH_CONNECT app ops
  Split new NEARBY_DEVICES permissions
  Define new NEARBY_DEVICES permission group
 2021-03-23 12:56:30 +00:00
Aaron Huang
68d118e3c6 Merge "Move deduceRestrictedCapability to libs/net and rename it" into sc-dev 2021-03-23 12:50:40 +00:00
Junyu Lai
5b477acbbe Merge "Fix cannot find removeUnwantedCapability on R device" 2021-03-23 12:16:18 +00:00
Chiachang Wang
457f91decf Merge "Correct the logic in NetworkCapabilitiesTest" 2021-03-23 11:46:31 +00:00
TreeHugger Robot
3abddab65d Merge "Move 'notifyFinishedSignal' into a separate function" into sc-dev am: 49148d762d 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13932458

Change-Id: I48c695c487e81ce8c0a12c11fd42db5fa89be4d9
 2021-03-23 11:33:06 +00:00
TreeHugger Robot
6ab82a0ac1 Merge "Fix cannot find removeUnwantedCapability on R device" into sc-dev am: 4df0561763 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13966708

Change-Id: Idba9101d96bf9ef9c265996f05e974e307e6fc75
 2021-03-23 11:31:39 +00:00
TreeHugger Robot
49148d762d Merge "Move 'notifyFinishedSignal' into a separate function" into sc-dev 2021-03-23 11:18:33 +00:00
junyulai
c9afd3fa08 Fix cannot find removeUnwantedCapability on R device 
Test: atest CtsNetTestCasesLatestSdk:android.net.NetworkCapabilitiesTest
Fix: 183473863
Merged-In: Icf2cda325795acee22a6c634e8d978f64c5ac3cb
Change-Id: Icf2cda325795acee22a6c634e8d978f64c5ac3cb
  (cherry-picked from ag/13966708)
 2021-03-23 17:40:55 +08:00
junyulai
ffc922fe2a Fix cannot find removeUnwantedCapability on R device 
Test: atest CtsNetTestCasesLatestSdk:android.net.NetworkCapabilitiesTest
Fix: 183473863
Change-Id: Icf2cda325795acee22a6c634e8d978f64c5ac3cb
 2021-03-23 17:21:34 +08:00
Remi NGUYEN VAN
97e7a13e60 Merge "Remove NetdService, NetworkStackClient dependency" into sc-dev am: 41df46a030 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13946371

Change-Id: I331a7eea263111b691c9ebd2f648229b96ac50a7
 2021-03-23 08:21:05 +00:00
Siarhei Vishniakou
2cbaa91f67 Move 'notifyFinishedSignal' into a separate function 
To reduce the size of 'receiveFinishedSignals' and to simplify the
future CLs in this area, let's move the part where the Java code is
being notified into a separate function.

The behaviour should remain the same.

Test: atest InputEventSenderAndReceiverTest
Bug: 169866723
Change-Id: If0f0d630600a754d01d761f7a3bafce342b96d26
 2021-03-23 08:15:36 +00:00
Chiachang Wang
5a06d5b958 Correct the logic in NetworkCapabilitiesTest 
setOwnerUid() and setAdministratorUids() should run in R+.
Previous logic will skip them in S+. Correct the logic to
what it should be.

Bug: 172183305
Test: atest android.net.NetworkCapabilitiesTest
Change-Id: Ic983aa00f930fb26350469ef093bcba2990433a4
 2021-03-23 15:16:39 +08:00
Remi NGUYEN VAN
5a328c2a86 Remove NetdService, NetworkStackClient dependency 
Netd should be obtained via getSystemService, and
ModuleNetworkStackClient must be used instead of NetworkStackClient for
modules.

Bug: 171540887
Test: m
Change-Id: Ibe703ac56dd70673115cd8b95b44b856a7fc01f3
 2021-03-23 06:05:52 +00:00
Junyu Lai
f38268cd56 Merge "[VCN15] expose addUnwantedCapability and related APIs" 2021-03-23 05:02:22 +00:00
Frank Li
e0237a6a66 Merge "[TL02]Remove hidden API usage of NetworkAgent" into sc-dev am: 35dc633f46 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13931492

Change-Id: If440beb03e8305c79a14827cae3bd04bfd2af232
 2021-03-23 02:31:44 +00:00
Frank Li
35dc633f46 Merge "[TL02]Remove hidden API usage of NetworkAgent" into sc-dev 2021-03-23 02:03:59 +00:00
lifr
03f6fd2052 [TL02]Remove hidden API usage of NetworkAgent 
The connection service will become the mainline module.
Remove the hidden API usage of NetworkAgent.

Bug: 170598012
CTS-Coverage-Bug: 170598012
Test: atest FrameworksNetTests FrameworksTelephonyTests
      atest FrameworksWifiTests
Change-Id: I4e4040ae7f94bdf479c7df9ec2ffabafbe06331c
 2021-03-23 02:01:38 +00:00
Lorenzo Colitti
c7860b33ef Merge "[VCN15] expose addUnwantedCapability and related APIs" into sc-dev am: a93335981e 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13929102

Change-Id: I12a4d447a5864947dc32b8dd16a7ec34870d8338
 2021-03-23 01:51:33 +00:00
Lorenzo Colitti
a93335981e Merge "[VCN15] expose addUnwantedCapability and related APIs" into sc-dev 2021-03-23 01:19:39 +00:00
Jeff Sharkey
7b14b87647 Request new Bluetooth runtime permissions. 
An upcoming platform change is introducing a new "Nearby devices"
runtime permission which contains the new BLUETOOTH_CONNECT and
BLUETOOTH_SCAN permissions.

We have logic in place to use <split-permission> to translate the
older BLUETOOTH and BLUETOOTH_ADMIN permissions into these new
runtime permissions, but modern apps will need to pivot to
requesting them directly as part of targeting Android S.

This change requests both the old and new permissions to avoid
breakage while the new permission enforcement is being phased in.

Bug: 181813006
Test: atest CtsPermission2TestCases
Test: atest CtsPermission3TestCases
Test: atest CtsStatsdAtomHostTestCases
Change-Id: I39f45e7d22d132d44c84017cd98e6d9e98533c7f
 2021-03-22 15:34:05 -06:00
Siarhei Vishniakou
ac1d28294f Merge "Notify InputEventAssigner about every frame" into sc-dev am: e1c0d2a844 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13916313

Change-Id: Ib3755c9ec1ce2816b550920c899926c5ef92ff5f
 2021-03-22 19:26:15 +00:00
Cody Kesting
3a51a7d152 Reevaluate VcnGatewayConnections on receiving new configs. 
This CL updates Vcn.java to reevaluate its VcnGatewayConnections when it
receives a new VcnConfig. This may result in VcnGatewayConnections being
torn down (if their VcnGatewayConnectionConfig is not in the updated
VcnConfig) or established (if a NetworkRequest matches a new
VcnGatewayConnectionConfig).

Bug: 181815405
Test: atest FrameworksVcnTests CtsVcnTestCases
Change-Id: I7da60f60e972bd968e1ff4fe416fb9a1d3309a18
 2021-03-22 11:59:27 -07:00
Cody Kesting
c57281504e Rename VcnStatusCallback#onVcnStatusChanged. 
Per API Council feedback, VcnStatusCallback#onVcnStatusChanged is
renamed to VcnStatusCallback#onStatusChanged.

Bug: 182345902
Test: atest FrameworksVcnTests CtsVcnTestCases
Change-Id: Ie0277c5f053e1802aa98240618a9d9e8aa6d9d09
 2021-03-22 11:59:27 -07:00
Siarhei Vishniakou
e1c0d2a844 Merge "Notify InputEventAssigner about every frame" into sc-dev 2021-03-22 17:58:12 +00:00
Aaron Huang
cb16330091 Move deduceRestrictedCapability to libs/net and rename it 
NetworkCapabilities is included in framework-connectivity, so external
module cannot have dependencies on its hidden API. Move the method to
libs/net so that external modules can use it by including the library.

Bug: 178777253
Test: FrameworksNetTests
Change-Id: I77970b3a5e5e0e9d263639694b1f06519169bf64
 2021-03-22 22:35:10 +08:00
Lorenzo Colitti
0f0ecc4f4d Merge changes I90bf7957,If58524b0 am: 7a2f9c06ca am: 3042783816 am: 3c975c208f am: 30c71e6288 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1646972

Change-Id: I9447683ecd1b5766bf6bf6255933dbb910a9e0bf
 2021-03-22 14:21:51 +00:00
Lucas Lin
decb08ba06 Merge "Remove the usage of NETID_UNSET from Vpn.java" into sc-dev am: 385414ee28 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13927650

Change-Id: I5d067bba686983b369862579deedf2724f628683
 2021-03-22 13:20:54 +00:00
Lorenzo Colitti
7cbe35274d Merge "Use connectivity resources in service-connectivity" into sc-dev am: 9997912ba9 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13927651

Change-Id: I2ebb7e097d2294ee3382934ff6990ced753d45b7
 2021-03-22 13:17:51 +00:00
Roshan Pius
4b0ff1000b Merge "resolve merge conflicts of 403b7fd0b0 to stage-aosp-master" into sc-dev am: 1d050e01e0 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13944368

Change-Id: I27011732c7cb4eec1b99a5dd6284e0c957aff929
 2021-03-22 13:16:35 +00:00
Lorenzo Colitti
30c71e6288 Merge changes I90bf7957,If58524b0 am: 7a2f9c06ca am: 3042783816 am: 3c975c208f 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1646972

Change-Id: I0420784d706f64b05137074bfcfb58cdc232b83b
 2021-03-22 12:34:17 +00:00
junyulai
7ff635a9a9 [VCN15] expose addUnwantedCapability and related APIs 
Test: m -j doc-comment-check-docs
Bug: 175662146
Change-Id: I3f2e6a99e015f09cc4405f6804eac4ae33e3dcc7
 2021-03-22 11:11:26 +00:00
Lorenzo Colitti
3042783816 Merge changes I90bf7957,If58524b0 am: 7a2f9c06ca 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1646972

Change-Id: I1c3de9d738a294e9d21314de84384fa89745285d
 2021-03-22 10:17:37 +00:00
Lucas Lin
385414ee28 Merge "Remove the usage of NETID_UNSET from Vpn.java" into sc-dev 2021-03-22 09:38:26 +00:00
Lorenzo Colitti
a3d14561d5 Support calling registerDefaultNetworkCallback for another UID. 
This is to be used by privileged components (e.g., JobScheduler)
to request callbacks about the state of other UIDs on the system.

Bug: 165835257
Test: new unit test coverage
Change-Id: I29f155710394e58c14fcef488db6271d8d83033a
 2021-03-22 17:52:20 +09:00
junyulai
9fa79d20c7 [VCN15] expose addUnwantedCapability and related APIs 
Test: m -j doc-comment-check-docs
Bug: 175662146
Merged-In: I3f2e6a99e015f09cc4405f6804eac4ae33e3dcc7
Change-Id: I3f2e6a99e015f09cc4405f6804eac4ae33e3dcc7
  (cherry-picked from ag/13929102)
 2021-03-22 16:51:50 +08:00