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

565608 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Junyu Lai
caa3ffacfe Merge changes from topics "vcn04", "vcn12" am: 36b03734ef 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1628400

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: If14f8b2c89483095f22a2b1bc77b0d76cdcb8366
 2021-03-12 07:50:50 +00:00
Junyu Lai
36b03734ef Merge changes from topics "vcn04", "vcn12" 
* changes:
  [VCN12] Expose setSubIds/getSubIds APIs
  [VCN04] Add Subscription Id set into NetworkCapabilities
 2021-03-12 07:12:59 +00:00
Roshan Pius
890fdb016e Merge "ConnectivityManager: Provide API's to include location sensitive info" am: a982725793 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1595396

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ibf358f0532023ab990dea0ad958eacaa441e107c
 2021-03-12 05:58:11 +00:00
Roshan Pius
a982725793 Merge "ConnectivityManager: Provide API's to include location sensitive info" 2021-03-12 05:56:29 +00:00
Paul Hu
3bd9d6993b Merge "Stop using PackageManagerInternal in PermissionMonitor" am: 4f0e7df6e3 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1620879

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I61c84ce1b8e1a9ccdb8fd1581bf0c3906db943f3
 2021-03-12 05:51:23 +00:00
Paul Hu
4f0e7df6e3 Merge "Stop using PackageManagerInternal in PermissionMonitor" 2021-03-12 05:23:05 +00:00
Treehugger Robot
2025545d5d Merge "Remove Slog usage in NetworkState" am: e95af44a65 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1628360

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I6e01b140db4d44de081ba4d87cca63578271500e
 2021-03-12 05:15:42 +00:00
Remi NGUYEN VAN
75512d97f8 Merge "Move ParseException to Connectivity" am: cb35ed09da 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1626205

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I06ac628c283c0a59a756fb5d6e94afb5aef949dd
 2021-03-12 05:12:33 +00:00
Treehugger Robot
e95af44a65 Merge "Remove Slog usage in NetworkState" 2021-03-12 05:12:26 +00:00
Remi NGUYEN VAN
cb35ed09da Merge "Move ParseException to Connectivity" 2021-03-12 04:27:55 +00:00
Lucas Lin
46bafc65ab Merge changes Ib80f814f,Ic605e489 am: ae7491e2f9 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1626209

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I94fd187e5f2cc0428807668f82b3a29ad8b66c47
 2021-03-12 03:56:18 +00:00
Frank Li
e15c876029 Merge "[CS17]Remove useless code(AsyncChannel) from ConnectivityService" am: 2dafdfb0f8 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1625701

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I9096f951a18b1ffe96efa1d48207dac644d4e92c
 2021-03-12 03:52:27 +00:00
Lucas Lin
ae7491e2f9 Merge changes Ib80f814f,Ic605e489 
* changes:
  Use new API - getIpSecNetIdRange() in IpSecService
  Add a new API to get the network ID range of IPSec tunnel interface
 2021-03-12 03:30:32 +00:00
Frank Li
2dafdfb0f8 Merge "[CS17]Remove useless code(AsyncChannel) from ConnectivityService" 2021-03-12 02:45:30 +00:00
Roshan Pius
d9c78f6992 ConnectivityManager: Provide API's to include location sensitive info 
Existing NetworkCallback users will get NetworkCapabilities with
location sensitive data removed (except for ownerUid which will be
added for existing apps for backwards compatibility). Apps
have to opt-in to receive location sensitive data.

Note: This was chosen because WifiInfo is the only TransportInfo tha
has location sensitive info & that was added only in Android 12. If we
choose to default to true, all existings apps retrieving
NetworkCapabilities for wifi networks will be blamed for location access
unnecessarily.

Changes:
i) Add a flag in NetworkCallback creation to retrieve
NetworkCapabilities with location sensitive info in their callback.
(More flags are being planned for NetworkCallback for throttling
callback frequency, etc)
ii) For NetworkCapabilities.getOwnerUid(), we will continue to send the
data for apps targeting older SDK (since this is an existing field and
the new flag defaults location sensitive data to off).

Bug: 156867433
Test: atest android.net
Test: atest com.android.server
Change-Id: If70b5ea6f5c8885f0c353c8df08a826d55fe7f7a
 2021-03-11 18:27:18 -08:00
Remi NGUYEN VAN
2943678b0e Merge changes from topic "ethernet_specifier" am: c77293b7a9 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1626207

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I9ef1a287439b5f5705ff3b3b4de4ded54f61c1c1
 2021-03-12 00:12:52 +00:00
Remi NGUYEN VAN
c792424cad Add Ethernet, TestNetworkSpecifier API am: c5479a0886 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1574300

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I1a1b38fb6b8b6831bac016a8352ae9073758f9af
 2021-03-12 00:10:08 +00:00
Treehugger Robot
62aa26cacb Merge "Added mount to OWNERS for RecyclerView and ViewPager" am: 2273adedcd 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1629662

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I40e5292a7663baddddf604d1b6d164fa8b4541f7
 2021-03-12 00:05:24 +00:00
Remi NGUYEN VAN
c77293b7a9 Merge changes from topic "ethernet_specifier" 
* changes:
  Fix common tests on Q and R
  Add Ethernet, TestNetworkSpecifier API
 2021-03-11 23:51:49 +00:00
Treehugger Robot
2273adedcd Merge "Added mount to OWNERS for RecyclerView and ViewPager" 2021-03-11 23:38:03 +00:00
Grace Jia
e4bc4e9ca5 Merge "Annotation and doc improvement for adhoc conference APIs." am: 0251d617a5 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1412812

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ie6f423bfbd4965e4cc27c3e1591ecdef29dcf0c8
 2021-03-11 23:25:32 +00:00
mrenouf
695b9ee40e Merge "Update OWNERS for long screenshots framework code" am: 4392dd9cb8 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1619622

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ibe7f623cb291cab2201dc1b61cb5b42edd18b418
 2021-03-11 23:23:04 +00:00
Treehugger Robot
0dd1a463f0 Merge "Removed EpsQosSessionAttributes#onCreate" am: 5967b657ef 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1626282

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I2a43814aa235b0e293a8d8e160bdb13aa161b599
 2021-03-11 23:19:05 +00:00
Treehugger Robot
7d70dd9c33 Merge changes Iac9487e8,Ifa411c7b am: 999506022f 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1622675

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I2cf126259f903d407830b1e8bc2d3fcdc02b97c2
 2021-03-11 23:15:17 +00:00
Grace Jia
0251d617a5 Merge "Annotation and doc improvement for adhoc conference APIs." 2021-03-11 23:07:54 +00:00
mrenouf
4392dd9cb8 Merge "Update OWNERS for long screenshots framework code" 2021-03-11 22:41:24 +00:00
Treehugger Robot
5967b657ef Merge "Removed EpsQosSessionAttributes#onCreate" 2021-03-11 22:37:36 +00:00
Treehugger Robot
999506022f Merge changes Iac9487e8,Ifa411c7b 
* changes:
  [VCN11] Make requestBackgroundNetwork requires handler
  [VCN10] Add new API to listen for highest score network
 2021-03-11 22:34:06 +00:00
Tianjie Xu
f593e71276 Merge "Extend the metrics for resume on reboot" am: 1c5faf6141 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1556763

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I833356a154218a3e2c914efd4b2a6242e37a26c6
 2021-03-11 22:18:39 +00:00
Tianjie Xu
1c5faf6141 Merge "Extend the metrics for resume on reboot" 2021-03-11 22:13:25 +00:00
Tyler Gunn
346a19a3ce Merge "Mark android.net.sip code as deprecated." am: 3b36aa32fa 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1540225

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I8d84a4fbaaf910ca3c0420229f67e282cf258f74
 2021-03-11 22:07:55 +00:00
Tyler Gunn
3b36aa32fa Merge "Mark android.net.sip code as deprecated." 2021-03-11 22:03:11 +00:00
Kevin Han
fe54088dcb Merge "Fix local service binding in tests." am: 6d0bf150e3 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1624867

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ieb43aae6f11a26f6d1d1937ab99880b3da19e352
 2021-03-11 22:00:03 +00:00
George Mount
029208ebdd Added mount to OWNERS for RecyclerView and ViewPager 
As requested, mount was added to OWNERS for RecyclerView
and ViewPager as changes are occasionally needed by UI
toolkit team.

Test: None
Change-Id: Ie3d49d0d5ddf092d2dd0680c6a067b2fe6b81f94
 2021-03-11 21:27:55 +00:00
mrenouf
7b969ae133 Update OWNERS for long screenshots framework code 
Adds OWNERS line for internal binder interfaces.

Test: n/a
Change-Id: Ib6cdef76c5c9444f7187e33588bb3fdfbf5f5787
 2021-03-11 21:23:44 +00:00
Kevin Han
6d0bf150e3 Merge "Fix local service binding in tests." 2021-03-11 21:10:43 +00:00
Daniel Bright
bb58b8a819 Merge "Update comments on onApnUnthrottled" am: 1bec754c8b 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1626323

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I4de8a5e489211dcaa469608a04ac07d70afb7391
 2021-03-11 18:29:33 +00:00
Daniel Bright
1bec754c8b Merge "Update comments on onApnUnthrottled" 2021-03-11 18:02:36 +00:00
Neil Fuller
288f5630c1 Merge "Add MetricsTimeZoneSuggestion for metrics use" am: c06b300638 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1628820

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I6166e51e6c323c6f0ae46a0515189468ce897ba6
 2021-03-11 17:46:17 +00:00
Neil Fuller
6ca6f593a1 Merge "OWNERS change / new .proto file" am: 6d3fb3d57c 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1628819

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I7cbee2d8c4938aca3045f22c61c03b9961faac7a
 2021-03-11 17:43:27 +00:00
Neil Fuller
c06b300638 Merge "Add MetricsTimeZoneSuggestion for metrics use" 2021-03-11 17:38:30 +00:00
James Mattis
987d246395 Merge "Add auto-postsubmit test tag for frameworks/base" am: ec14bafb25 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1626462

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ica56ddfb4e4320ab5e553856b9ef3abf88add266
 2021-03-11 17:33:52 +00:00
lucaslin
7d02c64846 Use new API - getIpSecNetIdRange() in IpSecService 
Use new API - getIpSecNetIdRange() to get the network ID range
of IPSec tunnel interface.

Bug: 172183305
Test: atest FrameworksNetTests:IpSecServiceTest
Change-Id: Ib80f814f991e9f000a68f5c539d15d97cf56930e
 2021-03-11 17:30:18 +00:00
Neil Fuller
6d3fb3d57c Merge "OWNERS change / new .proto file" 2021-03-11 17:12:18 +00:00
James Mattis
ec14bafb25 Merge "Add auto-postsubmit test tag for frameworks/base" 2021-03-11 17:05:34 +00:00
lucaslin
21d01e8d45 Add a new API to get the network ID range of IPSec tunnel interface 
- Add a new API to get the network ID range of IPSec tunnel
interface.
- Use the new API in IpSecServiceTest to make sure the result is
the same. Follow-up commit will change the logic in
IpSecService#reserveNetId(), the modified test can ensure the
correctness of the new change.

Bug: 172183305
Test: atest FrameworksNetTests:IpSecServiceTest
Change-Id: Ic605e48941fc9d6482cdcd01a8adcdc9b6d586a6
 2021-03-12 00:46:33 +08:00
Janis Danisevskis
8b7ca71fd7 Merge "Keystore 2.0: Remove hidden API from RecoverableKeystore" am: 5de808c5e2 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1624871

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I9ccf99568c8238256addc02982a9b63757a7a22e
 2021-03-11 16:18:12 +00:00
Janis Danisevskis
5de808c5e2 Merge "Keystore 2.0: Remove hidden API from RecoverableKeystore" 2021-03-11 15:50:32 +00:00
junyulai
d7aa5725f4 [VCN12] Expose setSubIds/getSubIds APIs 
Test: atest NetworkCapabilitiesTest
Bug: 175662146
Change-Id: Ia4b98bc6c5fcefee44233f3b7fbb6517a0e8870e
 2021-03-11 23:03:19 +08:00
junyulai
3b1bc32275 [VCN04] Add Subscription Id set into NetworkCapabilities 
This is a generic way to request networks that has different
subId but belongs to the same carrier. For example, cellular
networks with different SIM card, or carrier Wifi that
provided by the operator.

Test: atest NetworkCapabilitiesTest#testSubIds
Test: m doc-comment-check-docs -j
Test: atest CtsNetTestCases
Bug: 175662146

Change-Id: Ifca766f5acc73c285948d6251ec31506d9bb0bcb
 2021-03-11 23:03:05 +08:00