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

567247 Commits

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Iae13465b19d5245782cded0d01ff1b39617c8ac8
 2021-03-12 08:24:46 +00:00
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
0659f32f4d Merge "ConnectivityManager: Provide API's to include location sensitive info" am: a982725793 am: 890fdb016e 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1595396

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I47515a4c38e96f6e1caa8ceb50e6b83de8c3ec35
 2021-03-12 06:30:45 +00:00
Paul Hu
c065b05794 Merge "Stop using PackageManagerInternal in PermissionMonitor" am: 4f0e7df6e3 am: 3bd9d6993b 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1620879

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I3cc5b5a8d6ae737f75f9c1cf17f7113bed663613
 2021-03-12 06:30:34 +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
Treehugger Robot
1c38988a79 Merge "Remove Slog usage in NetworkState" am: e95af44a65 am: 2025545d5d 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1628360

MUST ONLY BE SUBMITTED BY AUTOMERGER

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ibb5674e812f2a2f2a6a1e23aa46a2d8f208099f5
 2021-03-12 05:32:43 +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
Lucas Lin
7b190776ba Merge changes Ib80f814f,Ic605e489 am: ae7491e2f9 am: 46bafc65ab 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1626209

MUST ONLY BE SUBMITTED BY AUTOMERGER

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ic6aa11902b9ade040bee702650722edfd65b9113
 2021-03-12 04:34:11 +00:00
Remi NGUYEN VAN
cb35ed09da Merge "Move ParseException to Connectivity" 2021-03-12 04:27:55 +00:00
TreeHugger Robot
953c3c8cba [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev am: 64ab91ef98 -s ours 
am skip reason: subject contains skip directive

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I8ea65d02d7426a6296458e6320cd77d07bb35505
 2021-03-12 04:13:17 +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
TreeHugger Robot
64ab91ef98 Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev 2021-03-12 03:29:46 +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
Winson Chiu
c81a4d3b7a [automerger skipped] Revert "Only allow BROWSABLE && DEFAULT Intents to be always opened" am: f83d79928f am: e75b482280 -s ours am: 90b62806ae -s ours 
am skip reason: Change-Id I78284e0a0dd5c41345753cdd2ed9a518db1df930 with SHA-1 2ef71e3c85 is in history

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Id1ab57380355dea6b389d388aac1f98987a97aca
 2021-03-12 00:44:31 +00:00
Remi NGUYEN VAN
1764ceaa67 Merge changes from topic "ethernet_specifier" am: c77293b7a9 am: 2943678b0e 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1626207

MUST ONLY BE SUBMITTED BY AUTOMERGER

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Id7b9ca5d814aa27e295c46b755af35743de5d434
 2021-03-12 00:25:20 +00: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
Grace Jia
3e96c1328c Merge "Annotation and doc improvement for adhoc conference APIs." am: 0251d617a5 am: e4bc4e9ca5 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1412812

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Iee57bef7f60bb612b864a72d5bf2d98115b03d28
 2021-03-12 00:05:34 +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
mrenouf
85bf625569 Merge "Update OWNERS for long screenshots framework code" am: 4392dd9cb8 am: 695b9ee40e 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1619622

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I5fe8f6ed9302d560959f28d9ebd2f309fb6502ef
 2021-03-12 00:05:22 +00:00
Treehugger Robot
8de105cc8b Merge "Removed EpsQosSessionAttributes#onCreate" am: 5967b657ef am: 0dd1a463f0 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1626282

MUST ONLY BE SUBMITTED BY AUTOMERGER

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I0742b4bb3c5b2ddaa06830b403d849ed25ef71cd
 2021-03-12 00:04:56 +00:00
Winson Chiu
90b62806ae [automerger skipped] Revert "Only allow BROWSABLE && DEFAULT Intents to be always opened" am: f83d79928f am: e75b482280 -s ours 
am skip reason: Change-Id I78284e0a0dd5c41345753cdd2ed9a518db1df930 with SHA-1 2ef71e3c85 is in history

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ib77c0e855fe142deeefc2c2e1bede949b2bde26c
 2021-03-12 00:04: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
TreeHugger Robot
e23f71e88e Merge "Revert "Only allow BROWSABLE && DEFAULT Intents to be always opened"" into rvc-qpr-dev am: 5079f881c0 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13727687

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I4eba7c6725fa82b1402153a7bd2d4fe2814f10d4
 2021-03-11 23:15:00 +00:00
Winson Chiu
e75b482280 Revert "Only allow BROWSABLE && DEFAULT Intents to be always opened" am: f83d79928f 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13727756

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ia9ad54a05bfebadde7cd9cb516342cb6d763c328
 2021-03-11 23:14:28 +00:00
Grace Jia
0251d617a5 Merge "Annotation and doc improvement for adhoc conference APIs." 2021-03-11 23:07:54 +00:00
TreeHugger Robot
5079f881c0 Merge "Revert "Only allow BROWSABLE && DEFAULT Intents to be always opened"" into rvc-qpr-dev 2021-03-11 22:49:55 +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
Tianjie Xu
2184af92df Merge "Extend the metrics for resume on reboot" am: 1c5faf6141 am: f593e71276 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1556763

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I8dbb655ca1511ab9a194c68171995b93fb95a24c
 2021-03-11 22:37:33 +00:00
Tyler Gunn
b40dd1553c Merge "Mark android.net.sip code as deprecated." am: 3b36aa32fa am: 346a19a3ce 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1540225

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Iabfc90911c149ce44e6c9133abf320b1a2809372
 2021-03-11 22:36:54 +00:00