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

565640 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Hasini Gunasinghe
181ffb4bec Merge "Keystore2: Integrate getState method of IKeystoreMaintenance AIDL." am: 11e324829e 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1630059

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ie9e2b82448ca1c0deb1339acee034933039cd711
 2021-03-12 17:16:30 +00:00
Hasini Gunasinghe
11e324829e Merge "Keystore2: Integrate getState method of IKeystoreMaintenance AIDL." 2021-03-12 16:30:58 +00:00
Andrei-Valentin Onea
086acc1ba8 Merge changes Idd7d86f9,I73569744 am: 420476e0cd 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1532338

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I0a5605574dd5126717f879b2dd367861cc35c215
 2021-03-12 14:05:58 +00:00
tomnatan
b470b0d67e Add support for loading a static overrides file located in /product. am: ed60ceba22 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1614848

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I3194eee0ac82c6bb3b579ce297437d48cfcc854e
 2021-03-12 14:03:45 +00:00
Andrei-Valentin Onea
420476e0cd Merge changes Idd7d86f9,I73569744 
* changes:
  Do not enable changes newer than the current sdk
  Add support for loading a static overrides file located in /product.
 2021-03-12 13:28:50 +00:00
Nicolas Geoffray
5f117b3491 Merge "Remove some methods from DdmVmInternal." am: af174a5708 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1549965

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I311a25be21589b452094c1929ad9b695d1eb419f
 2021-03-12 12:45:27 +00:00
Nicolas Geoffray
af174a5708 Merge "Remove some methods from DdmVmInternal." 2021-03-12 12:05:45 +00:00
Dorin Drimus
ce25438e38 Merge "Improve some External Storage Notification texts on TVs" am: 894c63654d 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1621095

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I46b14ea01ba656b112f0790c8b0ff758a4049585
 2021-03-12 10:39:19 +00:00
Dorin Drimus
894c63654d Merge "Improve some External Storage Notification texts on TVs" 2021-03-12 09:58:40 +00:00
Remi NGUYEN VAN
d340bc1251 Merge "Remove usage of hidden InetSocketAddress constructor" am: 71ef86e01a 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1625901

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I0e2bc5128658973dc873aa3f6eb41593d8d9a308
 2021-03-12 09:30:30 +00:00
Treehugger Robot
09702cc405 Merge "Remove hidden @NetworkType in NetworkInfo" am: a247ffeaad 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1628359

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ie8cdd5f7eec86f8bc882f70dbc7480a0c0669358
 2021-03-12 09:27:20 +00:00
Treehugger Robot
88b6a46685 Merge "Remove hidden INVALID_RESOURCE_ID in unused param" am: 3e432de2a8 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1628299

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ida08886109393bc8255de1eec64d5f0a45970eba
 2021-03-12 09:24:09 +00:00
Treehugger Robot
098ac69976 Merge "Use ParcelDescriptor.fromSocket instead of getFileDescriptor" am: 7b327e1bef 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1625439

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I3b3e8b098eb80098198b1e1cf6c2ce2fe138bc0a
 2021-03-12 09:22:33 +00:00
Remi NGUYEN VAN
71ef86e01a Merge "Remove usage of hidden InetSocketAddress constructor" 2021-03-12 09:02:15 +00:00
Treehugger Robot
a247ffeaad Merge "Remove hidden @NetworkType in NetworkInfo" 2021-03-12 08:59:35 +00:00
Treehugger Robot
3e432de2a8 Merge "Remove hidden INVALID_RESOURCE_ID in unused param" 2021-03-12 08:57:55 +00:00
Treehugger Robot
7b327e1bef Merge "Use ParcelDescriptor.fromSocket instead of getFileDescriptor" 2021-03-12 08:57:47 +00:00
Treehugger Robot
d41966bca6 Merge "Refactor DynamicSystemInstallationService notifications" am: fe4b43da67 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1541269

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I2feba62081661bba530051cf14342660bbed8b77
 2021-03-12 08:01:32 +00:00
Paul Hu
844a524110 Merge "Expose Intent#ACTION_CLEAR_DNS_CACHE" am: 240fdc5d97 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1625867

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I068cb524cecb9ea5a7bb712902859f244928ee2c
 2021-03-12 07:58:45 +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
Treehugger Robot
fe4b43da67 Merge "Refactor DynamicSystemInstallationService notifications" 2021-03-12 07:48:51 +00:00
Paul Hu
240fdc5d97 Merge "Expose Intent#ACTION_CLEAR_DNS_CACHE" 2021-03-12 07:47:10 +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
paulhu
97c860113a Expose Intent#ACTION_CLEAR_DNS_CACHE 
DnsManager will broadcast ACTION_CLEAR_DNS_CACHE intent to clear
dns cache when network have changed. But DnsManager is in the
Connectivity mainline module which can not use non-formal API.
Thus, expose Intent#ACTION_CLEAR_DNS_CACHE as module lib API for
mainline module.

Bug: 182370679
Test: m update-api
Merged-In: I30b1b146dcae82926be7bdb8b343635a01eabefe

Change-Id: I30b1b146dcae82926be7bdb8b343635a01eabefe
 2021-03-12 05:21:08 +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
Hasini Gunasinghe
e92adf724b Keystore2: Integrate getState method of IKeystoreMaintenance AIDL. 
Bug: 176123105
Test: TBD
Change-Id: I8bc6bf219f7c4bb3722c310debcc8a276d14ed98
 2021-03-12 00:07:44 +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