Commit Graph

93920 Commits

Author SHA1 Message Date
Lorenzo Colitti
2e58d5b4e5 Merge "Unremove DnsResolver#query method used by external developers" am: 3dd6df002b
am: 3206b80bae

Change-Id: I8c555bc94ec774ebaed4836db7fefece88556d16
2019-03-29 08:23:31 -07:00
Lorenzo Colitti
3206b80bae Merge "Unremove DnsResolver#query method used by external developers"
am: 3dd6df002b

Change-Id: I0c8b5b5fe68b99cacc4da10ae27b69fcab8685b7
2019-03-29 08:09:18 -07:00
Luke Huang
e9b2bba302 Unremove DnsResolver#query method used by external developers
This method was removed as part of addressing API council feedback in b/129261432
Add back previous DnsResolver#query which is already being used by developers.

Bug: 129395490
Test: atest DnsResolverTest

Change-Id: Ic956db204f3940d39d42e1b11dda39e57d356fad
2019-03-29 18:12:26 +08:00
Luke Huang
ceb74821a3 Merge "Use IDnsResolver instead of INetd for resolver related binder commands" am: b9ef4dd299
am: 1711278ce2

Change-Id: I80ae047bd65b654e01061a9f218be23e1e3ef2ed
2019-03-29 02:10:55 -07:00
Luke Huang
1711278ce2 Merge "Use IDnsResolver instead of INetd for resolver related binder commands"
am: b9ef4dd299

Change-Id: Icca07604bc8f922c51493e72fde8c7377105bf8b
2019-03-29 01:57:44 -07:00
Luke Huang
b9ef4dd299 Merge "Use IDnsResolver instead of INetd for resolver related binder commands" 2019-03-29 08:45:19 +00:00
Luke Huang
2cc1be3b5a Merge "Fix cancellation race problem for aysnc DNS API" am: 1859ae7e7d
am: 391b3aa532

Change-Id: I633a592c7f46162268a759f84a77211443e9a04e
2019-03-28 20:45:44 -07:00
Luke Huang
391b3aa532 Merge "Fix cancellation race problem for aysnc DNS API"
am: 1859ae7e7d

Change-Id: I7e22c38c502fa0181e97057d9992c2a43c11b378
2019-03-28 20:32:40 -07:00
Luke Huang
1859ae7e7d Merge "Fix cancellation race problem for aysnc DNS API" 2019-03-29 03:15:32 +00:00
Varun Anand
112b8bd6c5 Merge changes from topic "vpn_data_accounting" am: 6c93e5378a
am: 09ef7691f5

Change-Id: If4fff1b4d14e80e024ce7b1aa85ebd3afcb1ecc2
2019-03-28 18:16:37 -07:00
Varun Anand
09ef7691f5 Merge changes from topic "vpn_data_accounting"
am: 6c93e5378a

Change-Id: Iaa4b2dd9be2fc6e9833c6c846b6858aab507ca8b
2019-03-28 18:06:12 -07:00
Varun Anand
6c93e5378a Merge changes from topic "vpn_data_accounting"
* changes:
  Move BatteryStats and StatsCompanionService to use NetworkStatsService.
  NetworkStatsService: Fix getDetailedUidStats to take VPNs into account.
  Take all VPN underlying networks into account when migrating traffic for VPN uid.
2019-03-29 00:40:53 +00:00
Hans Boehm
8331efe0af Merge "Clarify hasSelection description" am: 6bd5cf2bcc
am: 0e63b9ce98

Change-Id: I9dd2aab2f7a1f2b249d2919dafeb3c1879469933
2019-03-28 15:48:30 -07:00
Hans Boehm
0e63b9ce98 Merge "Clarify hasSelection description"
am: 6bd5cf2bcc

Change-Id: Ia7f3d0eae07f978ad29a7f3e127f1bf71c14c8dc
2019-03-28 15:39:43 -07:00
Hans Boehm
6bd5cf2bcc Merge "Clarify hasSelection description" 2019-03-28 22:21:00 +00:00
Varun Anand
346aa87544 Move BatteryStats and StatsCompanionService to use NetworkStatsService.
This CL is a manual merge of http://ag/c/6015966/3.

Bug: 113122541
Bug: 120145746
Test: atest FrameworksNetTests
Test: manual test: verified that BatteryStats are correctly accounting
for VPN traffic.
Change-Id: I5b07ce70ac58bdcbebc3114bfe9fd411469d57af
Merged-In: I230c1edbf64cfeb3dbb560db368b5e420f7b79a4
2019-03-28 10:31:51 -07:00
Varun Anand
29d2ef2fe1 NetworkStatsService: Fix getDetailedUidStats to take VPNs into account.
This API is similar to one provided by NetworkStatsFactory with the
difference that NSS also migrates traffic from VPN UID to other apps.

Since traffic can only be migrated over NetworkStats delta, NSS
therefore maintains NetworkStats snapshot across all UIDs/ifaces/tags.

This snapshot gets updated whenever NSS records a new snapshot
(based on various hooks such as VPN updating its underlying networks,
network getting lost, etc.), or getDetailedUidStats API is invoked by
one of its callers.

Bug: 113122541
Bug: 120145746
Test: atest FrameworksNetTests
Test: manually verified that battery stats are migrating traffic off of
TUN (after patching above CL where we point BatteryStats to use this
API).
Change-Id: Ib0f0c2d4d41ee1d7a027ea9da457baaf198d649e
2019-03-28 10:31:51 -07:00
Varun Anand
95aa6d446f Take all VPN underlying networks into account when migrating traffic for
VPN uid.

Bug: 113122541
Bug: 120145746
Test: atest FrameworksNetTests
Test: Manually verified on device that stats from VPN UID are moved
      appropriately based on its declared underlying network set.
Test: vogar --mode app_process --benchmark NetworkStatsBenchmark.java

Change-Id: I9d8d0cc58d18002c1c96f8ddff780ef8dc452d21
2019-03-28 10:31:49 -07:00
Luke Huang
5386f49418 Fix cancellation race problem for aysnc DNS API
This problem might cause double-close fd and result in app crash
or unexpected behaviour

Bug: 129317069
Test: atest DnsResolverTest
      manual test with delaying response callback/cancel
Change-Id: I223234f527edafc51d34fa6be390419c05def8d8
2019-03-28 19:46:56 +08:00
Nicolas Geoffray
f2c49988c3 Merge "Revert "Preload non-bootclasspath Java lib ClassLoaders."" am: d08c3b655b
am: 7561d4667c

Change-Id: Id50466763aedf746d796af8575ea922fdd9cad8e
2019-03-28 02:55:41 -07:00
Nicolas Geoffray
7561d4667c Merge "Revert "Preload non-bootclasspath Java lib ClassLoaders.""
am: d08c3b655b

Change-Id: Id04898d99862cc1fff248fc9ba466faf55e30eb7
2019-03-28 02:39:21 -07:00
Nicolas Geoffray
d08c3b655b Merge "Revert "Preload non-bootclasspath Java lib ClassLoaders."" 2019-03-28 09:27:05 +00:00
Nicolas Geoffray
d3c2bc5a4e Revert "Preload non-bootclasspath Java lib ClassLoaders."
This reverts commit 1b11aaaf9b.

Bug: 128529256
Bug: 127406460

Reason for revert: Breaks FSI

Change-Id: Ie9775779cda7b376c36493f3ce3246eafc672c59
2019-03-28 09:25:11 +00:00
Jack Yu
862152f8cd Merge "Update Android Beam deprecated API description" am: 527b6de018
am: 8b855b16f3

Change-Id: I461e11ff4129c61783bf988ae425a32c9b60e20f
2019-03-27 18:59:43 -07:00
Jack Yu
8b855b16f3 Merge "Update Android Beam deprecated API description"
am: 527b6de018

Change-Id: Icf9d876a705f4f10365c836d3e0c15f476ce113e
2019-03-27 18:52:23 -07:00
Treehugger Robot
527b6de018 Merge "Update Android Beam deprecated API description" 2019-03-28 01:33:58 +00:00
Junyu Lai
213cda6940 Merge changes I0baf582f,I4bba01ba am: e5ee6b9b31
am: abb63e3a99

Change-Id: Ia6cd87afec7c449b9096400352c5f6de75a012bc
2019-03-27 18:27:36 -07:00
Junyu Lai
abb63e3a99 Merge changes I0baf582f,I4bba01ba
am: e5ee6b9b31

Change-Id: Ie69a03e6c61e172ba7e9948706fe6780be61a41b
2019-03-27 18:17:27 -07:00
Junyu Lai
e5ee6b9b31 Merge changes I0baf582f,I4bba01ba
* changes:
  Block unpriviledged apps which create keepalives with null fd
  Fix keepalive don't get removed when lower layer error
2019-03-28 00:53:20 +00:00
Steven Moreland
62814d83bd Merge "Preload non-bootclasspath Java lib ClassLoaders." am: 213812ba28
am: 625d63ed64

Change-Id: Ie3c5931c981095e574e9dcadf8ed88686749116a
2019-03-27 16:32:12 -07:00
Steven Moreland
625d63ed64 Merge "Preload non-bootclasspath Java lib ClassLoaders."
am: 213812ba28

Change-Id: Ie16e82383bab53b5f92258289bf50ba9d7a897cd
2019-03-27 16:18:22 -07:00
Steven Moreland
213812ba28 Merge "Preload non-bootclasspath Java lib ClassLoaders." 2019-03-27 22:59:49 +00:00
Andrei-Valentin Onea
1a129b474d Merge changes from topic "unsupported-internal" am: 2f573ac6f8
am: 6acb2106f7

Change-Id: I98fdc3085646e3378560dc66eb7c46dfb74aee13
2019-03-27 07:07:16 -07:00
Andrei-Valentin Onea
6acb2106f7 Merge changes from topic "unsupported-internal"
am: 2f573ac6f8

Change-Id: I0fedf5c754a59a9c57b3abd00adff00d58b4930c
2019-03-27 06:56:12 -07:00
junyulai
15178155e0 Block unpriviledged apps which create keepalives with null fd
Currently, socketKeepalive implementation is accepting null fd
due to backward compatibility with legacy packet keepalive API.
However, due to lack of the fd, the service cannot guarantee the
port is not reused by another app if the caller release the port
for any reason.

Thus, grant the null fd access only for priviledged apps.

This commit also address some comments from aosp/918533.

Bug: 126699232
Test: atest FrameworksNetTests
Change-Id: I0baf582ff4ca8af6082c3754e8dfbcd867f39792
2019-03-27 19:51:08 +08:00
Andrei Onea
eecddd581e Add @UnsupportedAppUsage annotations
For packages:
  com.android.internal.app
  com.android.internal.database
  com.android.internal.http
  com.android.internal.os
  com.android.internal.policy
  com.android.internal.util
  com.android.internal.view
  com.android.internal.view.menu
  com.android.internal.widget
  com.android.server.net
  com.android.server
  com.google.android.collect
  com.google.android.util

This is an automatically generated CL. See go/UnsupportedAppUsage
for more details.

Exempted-From-Owner-Approval: Mechanical changes to the codebase
which have been approved by Android API council and announced on
android-eng@

Bug: 110868826
Test: m
Merged-In: Ia5306f4713298b46ae3aba6fc9d87fae41f8a593
Change-Id: Ie26033d486033289ad3e010a534a921d29c3b2ca
2019-03-27 11:22:20 +00:00
Luke Huang
6591477a5b Use IDnsResolver instead of INetd for resolver related binder commands
migrate resolver related commands from INetd to IDnsResolver

Bug: 126141549
Test: atest FrameworksNetTests ConnectivityServiceTest Nat464XlatTest
      atest DnsManagerTest
Change-Id: I559c0c1304d53dde408c062e1a52e742595e7cbe
2019-03-27 17:39:07 +08:00
Steven Moreland
1b11aaaf9b Preload non-bootclasspath Java lib ClassLoaders.
This is specifically for HIDL but is applicable to other libs.

Classes on the bootclasspath are implicitly used by apps. For this
reason, many classes should not go there. However, there are some
libraries which are used by many apps/processes which are still
nice to preload the ClassLoaders of.

Now, cacheNonBootclasspathSystemLibs in ApplciationLoaders keeps
a map of jar -> ClassLoader in zygote to be retrieved by child
processes.

Bug: 128529256
Bug: 127406460
Test: boot Pixel 2, verify libs are preloaded and used, try apps that
    use these libraries.
Test: grep for ClassLoaderContext errors, for instance:
 - ClassLoaderContext shared library size mismatch
 - ClassLoaderContext classpath element mismatch
Test: showmap on various processes which use the preloaded libs.

Change-Id: I351bf1679e9a928c10dca860b6cd6cb414c3bb8e
2019-03-27 01:40:05 -07:00
Remi NGUYEN VAN
ddac1161d9 Merge "Use SystemApi framework parcelables directly" am: 021ea66aea
am: 4864ffd97e

Change-Id: I28b60bcaf76d8902f3cd9d7956931c98d8d85710
2019-03-26 20:18:30 -07:00
Remi NGUYEN VAN
4864ffd97e Merge "Use SystemApi framework parcelables directly"
am: 021ea66aea

Change-Id: I33ab2a6935edc25eb0cfcaee258ef6da92ed2c83
2019-03-26 20:09:17 -07:00
Treehugger Robot
021ea66aea Merge "Use SystemApi framework parcelables directly" 2019-03-27 02:55:15 +00:00
Remi NGUYEN VAN
266868246a Use SystemApi framework parcelables directly
Remove StaticIpConfigurationParcelable and ApfCapabilitiesParcelable and
use StaticIpConfiguration and ApfCapabilities directly.
These two classes are SystemApi and defined in framework.jar, so no
stability guarantee is needed: the parceled and unparceled class will
always be the framework.jar version.

Bug: 126477266
Fixes: 126477266
Test: atest FrameworksNetTests NetworkStackTests
Test: flashed, booted, WiFi and captive portal works.
Change-Id: Iaf80ae23e003752cc6d2300700021931923b6533
2019-03-26 12:05:27 +09:00
Remi NGUYEN VAN
b141a800ac Merge "Add nullability annotations" am: a1ee1fc888
am: 3d48153a8f

Change-Id: Ic81850c2976e7412e85856c5d1336f30d0691125
2019-03-25 06:42:49 -07:00
Remi NGUYEN VAN
3d48153a8f Merge "Add nullability annotations"
am: a1ee1fc888

Change-Id: I47ec92d406b16eaff049ad4a5af1b1b407418e4d
2019-03-25 06:33:40 -07:00
Treehugger Robot
a1ee1fc888 Merge "Add nullability annotations" 2019-03-25 13:19:19 +00:00
Junyu Lai
d24f3fc8b1 Merge "Fix SocketKeepalive APIs which do not meet API review requirement" am: 8324c3e7e5
am: 08e1787088

Change-Id: Iead39e877aec917ff3c409fda1ff0c4dbaa21fcb
2019-03-25 04:06:39 -07:00
Junyu Lai
08e1787088 Merge "Fix SocketKeepalive APIs which do not meet API review requirement"
am: 8324c3e7e5

Change-Id: Id82be12a54e676c4ad18900ae910e6d08079e62c
2019-03-25 03:57:32 -07:00
Remi NGUYEN VAN
f6ae002aba Merge "Add nullable annotations to startActivityAsUser" am: 743a4b7872
am: 2704d2f4f6

Change-Id: I9f52f733b219acaae437c452bc238f6933bb0cec
2019-03-25 03:50:40 -07:00
Junyu Lai
8324c3e7e5 Merge "Fix SocketKeepalive APIs which do not meet API review requirement" 2019-03-25 10:42:37 +00:00
Remi NGUYEN VAN
2704d2f4f6 Merge "Add nullable annotations to startActivityAsUser"
am: 743a4b7872

Change-Id: Ifa44f448fd37ecc2051a16d979717b8aeaa05ebf
2019-03-25 03:41:34 -07:00