OSDN Git Service
Mark Chien [Fri, 29 Mar 2019 06:15:11 +0000 (06:15 +0000)]
Merge "[KA09] add keepalive offload permission to shell"
Luke Huang [Fri, 29 Mar 2019 03:15:32 +0000 (03:15 +0000)]
Merge "Fix cancellation race problem for aysnc DNS API"
Varun Anand [Fri, 29 Mar 2019 00:40:53 +0000 (00:40 +0000)]
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.
Treehugger Robot [Thu, 28 Mar 2019 23:34:34 +0000 (23:34 +0000)]
Merge "Close tethering when UI entitlement fails"
Hans Boehm [Thu, 28 Mar 2019 22:21:00 +0000 (22:21 +0000)]
Merge "Clarify hasSelection description"
Sooraj Sasindran [Thu, 28 Mar 2019 22:13:37 +0000 (22:13 +0000)]
Merge "Change Values for Opportunistic Entry & Exit Thresholds"
Evan Tyra [Wed, 27 Mar 2019 22:11:15 +0000 (15:11 -0700)]
Change Values for Opportunistic Entry & Exit Thresholds
Due to the generally higher quality of these networks, we expanded the
entry and exit criteria of opportunistic networks.
Test: Make
Change-Id: Iaac1641db1d6a07bcce6dd194765c79c83a92070
Merged-In: Iaac1641db1d6a07bcce6dd194765c79c83a92070
Treehugger Robot [Thu, 28 Mar 2019 19:56:53 +0000 (19:56 +0000)]
Merge "Migrate frameworks/base/packages/Shell to androidx.test"
Treehugger Robot [Thu, 28 Mar 2019 18:34:28 +0000 (18:34 +0000)]
Merge "Shutdown device gracefully when net discharging"
Jayachandran Chinnakkannu [Thu, 28 Mar 2019 18:05:53 +0000 (18:05 +0000)]
Merge "Revert "improve mism support for phonestatelistner""
Xiangyu/Malcolm Chen [Thu, 28 Mar 2019 17:54:14 +0000 (17:54 +0000)]
Merge changes from topic "
126637721"
* changes:
Show signal strength of current active subscription
Update document of setSubscriptionEnabled public API.
Clean up shouldHideSubscription API
Varun Anand [Fri, 25 Jan 2019 02:03:00 +0000 (18:03 -0800)]
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
Varun Anand [Sat, 19 Jan 2019 03:22:48 +0000 (19:22 -0800)]
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
Varun Anand [Mon, 18 Feb 2019 07:43:25 +0000 (23:43 -0800)]
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
Treehugger Robot [Thu, 28 Mar 2019 17:31:14 +0000 (17:31 +0000)]
Merge "To add the Android.bp of ExternalStorageProvider"
Jayachandran Chinnakkannu [Thu, 28 Mar 2019 16:31:19 +0000 (16:31 +0000)]
Revert "improve mism support for phonestatelistner"
This reverts commit
2506ceb71e1535af49fd3495f8eae0bbdfe36c5b.
Reason for revert: DSDS system UI issues (b/
129426477)
Change-Id: Ic0fde0d3bd412868917cdbe74504c3f9cebdc712
Luke Huang [Tue, 26 Mar 2019 07:50:10 +0000 (15:50 +0800)]
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
Mark Chien [Thu, 28 Mar 2019 09:52:52 +0000 (09:52 +0000)]
Merge "Only apply entitlement check to cellular upstream"
Nicolas Geoffray [Thu, 28 Mar 2019 09:27:05 +0000 (09:27 +0000)]
Merge "Revert "Preload non-bootclasspath Java lib ClassLoaders.""
Nicolas Geoffray [Thu, 28 Mar 2019 09:25:11 +0000 (09:25 +0000)]
Revert "Preload non-bootclasspath Java lib ClassLoaders."
This reverts commit
1b11aaaf9ba824dc5df363736d54601e908efec6.
Bug:
128529256
Bug:
127406460
Reason for revert: Breaks FSI
Change-Id: Ie9775779cda7b376c36493f3ce3246eafc672c59
Treehugger Robot [Thu, 28 Mar 2019 07:48:59 +0000 (07:48 +0000)]
Merge "Move the attribute tags"
Chiachang Wang [Thu, 28 Mar 2019 05:37:21 +0000 (05:37 +0000)]
Merge "Align proto naming with server configuration"
markchien [Wed, 23 Jan 2019 09:24:10 +0000 (17:24 +0800)]
[KA09] add keepalive offload permission to shell
This change adds PACKET_KEEPALIVE_OFFLOAD to shell, which allows
shell or code with shell permission identity to use privileged
tcp keepalive offload API.
Bug:
114151147
Test: -atest ConnectivityManagerTest#testCreateTcpKeepalive
-build, flash, boot
Change-Id: Ib6660a5eaa72f83042596481452be4d415383f02
Merged-in: Ib6660a5eaa72f83042596481452be4d415383f02
markchien [Tue, 26 Mar 2019 13:41:59 +0000 (21:41 +0800)]
Close tethering when UI entitlement fails
This is a alternative way for moving TetherService logic
into EntitlementManager[1]. Settings would close tethering
when silent entitlement check fail. To be consistent,
tethering should also be closed if UI entitlement check
fails.
[1] https://android-review.googlesource.com/c/platform/frameworks/base/+/928136
bug:
129330738
Test: -build, flash, boot,
-atest EntitlementManagerTest
-manual test with carrier SIM
Change-Id: Idfc35461b6359f3a624e78d49b6f73812db6d8ab
Treehugger Robot [Thu, 28 Mar 2019 03:28:19 +0000 (03:28 +0000)]
Merge "support msim for captiveportal notification"
markchien [Fri, 7 Sep 2018 08:19:12 +0000 (16:19 +0800)]
Only apply entitlement check to cellular upstream
Instead of doing a tethering entitlement check whenever we turn
on tethering, provisioning result should only affect mobile
upstream. List behavior changes below:
1. Change tether entitlement check from pre-flight check to
run-time check.
2. Only run entitlement check when upstream is mobile.
3. Move schedule entitlement re-check logic from Settings to
framework.
4. Run all entitlement thing in TetherMaster thread to avoid
multi-thread problem.
Test: -atest FrameworksNetTests
-build, flash, booted
bug:
111490073
Change-Id: Ic2980b4d6864d6f7287816c43eb6cf7a5cdec541
Merged-in: Ic2980b4d6864d6f7287816c43eb6cf7a5cdec541
felkachang [Tue, 16 Oct 2018 12:46:26 +0000 (20:46 +0800)]
To add the Android.bp of ExternalStorageProvider
ExternalStorageProvider doesn't have any tests yet.
1. Convert Android.mk to Android.bp
2. Add init testcase
3. formatted by bpfmt -s -w Android.bp
Fixes:
117812397
Bug:
122332340
Test: atest ExternalStorageProviderTests
Change-Id: I74235832f453110742de0b15cb14fac7514ecf0e
Merged-In: I74235832f453110742de0b15cb14fac7514ecf0e
Treehugger Robot [Thu, 28 Mar 2019 01:33:58 +0000 (01:33 +0000)]
Merge "Update Android Beam deprecated API description"
Junyu Lai [Thu, 28 Mar 2019 00:53:20 +0000 (00:53 +0000)]
Merge changes I0baf582f,I4bba01ba
* changes:
Block unpriviledged apps which create keepalives with null fd
Fix keepalive don't get removed when lower layer error
Treehugger Robot [Thu, 28 Mar 2019 00:35:27 +0000 (00:35 +0000)]
Merge "Fix glob syntax"
Remi NGUYEN VAN [Thu, 28 Mar 2019 00:14:31 +0000 (00:14 +0000)]
Merge "Fix message names in dumpsys network_stack"
Steven Moreland [Wed, 27 Mar 2019 22:59:49 +0000 (22:59 +0000)]
Merge "Preload non-bootclasspath Java lib ClassLoaders."
Yifan Hong [Thu, 14 Feb 2019 00:00:43 +0000 (16:00 -0800)]
Shutdown device gracefully when net discharging
Instead of checking the presence of power supplies, check
battery status to determine whether it should
shutdown. In detail, shutdown if
battery level == 0 && status != charging
Change-Id: Ie3d93d305e40f2f45d60538e7831f00be0380544
Fixes:
115715604
Test: boots
Malcolm Chen [Wed, 27 Feb 2019 00:49:56 +0000 (16:49 -0800)]
Show signal strength of current active subscription
For grouped primary and opportunistic use-case, if both are active,
mobile signal bar should by default show which one is currently
used for Internet data. Unless carrier set it otherwise -- if they
want to always show signal bar of primary subscription.
Bug:
123780907
Test: manual
Change-Id: I62e298e7b9bdc82dd44f0c8ae783c623e101b0ef
Merged-In: I62e298e7b9bdc82dd44f0c8ae783c623e101b0ef
Malcolm Chen [Fri, 8 Mar 2019 23:27:38 +0000 (15:27 -0800)]
Update document of setSubscriptionEnabled public API.
Bug:
126391008
Test: build
Change-Id: Iffb7895f94f8d0b2d071edb1e06c8e99be14be4f
Merged-In: Iffb7895f94f8d0b2d071edb1e06c8e99be14be4f
Malcolm Chen [Thu, 28 Feb 2019 22:07:59 +0000 (14:07 -0800)]
Clean up shouldHideSubscription API
Combine shouldHideSubscription and isInvisibleSubscription
for better readability.
Bug:
126637721
Test: manual - use test app to call SubscriptionManager APIs to make
sure they return correct values.
Change-Id: I0deb463430a6825db40ec00abac49cb662e79437
Merged-In: I0deb463430a6825db40ec00abac49cb662e79437
Youming Ye [Wed, 27 Mar 2019 21:12:58 +0000 (21:12 +0000)]
Merge "Enable Telecom to bind third party InCallServices."
Xiangyu/Malcolm Chen [Wed, 27 Mar 2019 19:06:12 +0000 (19:06 +0000)]
Merge changes I592d3538,I791fd630
* changes:
Add @Nullable on SubscriptionInfo#getGroupUuid
Adding nullability annotation.
Hayden Gomes [Wed, 27 Mar 2019 19:01:48 +0000 (19:01 +0000)]
Merge "Moving BT SMS logic to internal telephony"
Colin Cross [Tue, 26 Mar 2019 18:03:05 +0000 (11:03 -0700)]
Fix glob syntax
Globs are only intended to support ** as a directory, i.e. **/*.java
not **.java.
Bug:
129411151
Test: m nothing
Change-Id: I0f6cb7c7ce8cd1ef8c09364c0946ac7157285a4d
Jack Yu [Wed, 27 Mar 2019 16:39:46 +0000 (16:39 +0000)]
Merge "Renamed DataSpecificRegistrationState"
Youming Ye [Tue, 2 Oct 2018 20:24:43 +0000 (13:24 -0700)]
Enable Telecom to bind third party InCallServices.
Changes for Telecom to bind third party companion apps or
automotive ui installed from Play Store. Add new permissions and
settings for the third party InCallService APIs.
Bug:
78174835
Test: Manual
Change-Id: I1b4eff28b9dfd61f1c951d14b6c82395b51fe769
Merged-In: I1b4eff28b9dfd61f1c951d14b6c82395b51fe769
Treehugger Robot [Wed, 27 Mar 2019 14:41:12 +0000 (14:41 +0000)]
Merge "Move tag definitions into policy"
Andrei-Valentin Onea [Wed, 27 Mar 2019 13:40:15 +0000 (13:40 +0000)]
Merge changes from topic "unsupported-internal"
* changes:
Add @UnsupportedAppUsage annotations
Add android internal dirs to hiddenapi-mappings
junyulai [Wed, 27 Mar 2019 03:00:37 +0000 (11:00 +0800)]
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
Andrei Onea [Wed, 27 Mar 2019 10:32:55 +0000 (10:32 +0000)]
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
Andrei Onea [Fri, 22 Mar 2019 14:56:51 +0000 (14:56 +0000)]
Add android internal dirs to hiddenapi-mappings
Bug:
110868826
Test: m hiddenapi-mappings
(cherry picked from commit
77b22e33b6f9f85567bddd420488f0e88fe27bff)
Merged-In: Ie13962cc6a58af88e63a95c7f0d846aceda11f53
Change-Id: Ic6d0f663f79466d0d8692a3ebfe4a9792cd7ca07
Chiachang Wang [Wed, 27 Mar 2019 09:33:52 +0000 (17:33 +0800)]
Align proto naming with server configuration
Update naming as server requirement.
Bug:
128887306
Test: build
Change-Id: Iae46b1e41a66b1ad7d0c166ac52d5442b0c4070d
Steven Moreland [Tue, 19 Mar 2019 03:15:28 +0000 (20:15 -0700)]
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
Lorenzo Colitti [Wed, 27 Mar 2019 07:55:35 +0000 (07:55 +0000)]
Merge "Enable more logs for networking"
chen xu [Wed, 27 Mar 2019 01:24:43 +0000 (18:24 -0700)]
support msim for captiveportal notification
Bug:
123025093
Test: Manual
Change-Id: Ie04f3ae9a825ab75077a94b108ac92075b6d4753
Sundong Ahn [Wed, 27 Mar 2019 06:23:25 +0000 (15:23 +0900)]
Move the attribute tags
The attribute tags are moved to below the sequence tag, becuase the
"attribute" must be after "sequence" for complexType.
Bug:
127435354
Test: m -j
Change-Id: Ib1fb7fa516d379ef480e2bd18edee2a910b44ea7
Treehugger Robot [Wed, 27 Mar 2019 05:21:29 +0000 (05:21 +0000)]
Merge "Get the permission information for native services"
Jack Yu [Thu, 21 Mar 2019 23:33:15 +0000 (16:33 -0700)]
Renamed DataSpecificRegistrationState
Renamed DataSpecificRegistrationState to
DataSpecificRegistrationInfo. And added some
APIs to test API so they can be accessed by
CTS.
Test: Manual
Bug:
127657991
Merged-In: I1a623c18f02cfd19ca1af9df912d859b363f42d1
Change-Id: I1a623c18f02cfd19ca1af9df912d859b363f42d1
(cherry picked from commit
dba103204cf09187dbb0147dac39457f5993769f)
Remi NGUYEN VAN [Tue, 26 Mar 2019 05:58:08 +0000 (14:58 +0900)]
Fix message names in dumpsys network_stack
Constants were stripped out by ProGuard, so
MessageUtils.findMessageNames would fail to find them.
Test: flashed, dumpsys network_stack shows message names
Fixes:
124619824
Change-Id: I285ce2ab52cdff48f17b422285a635bd34243498
junyulai [Wed, 27 Mar 2019 02:31:11 +0000 (10:31 +0800)]
Fix keepalive don't get removed when lower layer error
Currently, if the lower layer, e.g. wifi, didn't successfully
start keepalive by any reason. Due to the startedState changed
to NOT_STARTED first, the logic inside stop() will skip the
removing process and cause leak.
Thus, moving the changing of startedState to proper place first
to unblock subsequent changes first.
Bug:
123988249
Bug:
129371366
Test: atest FrameworksNetTests
Change-Id: I4bba01bacc80e1dac2023ef831b5ade5501894e4
Treehugger Robot [Wed, 27 Mar 2019 02:55:15 +0000 (02:55 +0000)]
Merge "Use SystemApi framework parcelables directly"
Chenbo Feng [Tue, 26 Mar 2019 21:36:34 +0000 (14:36 -0700)]
Get the permission information for native services
For native services such as mediaserver and audioserver, the permission
information cannot be retrieved from getInstalledPackages. Instead, the
high level permission information is avalaible in systemConfigs. With
those permission information, netd can store the complete list of uids
that have UPDATE_DEVICE_STATS permission.
Bug:
128944261
Test: dumpsys netd trafficcontroller
Change-Id: I0331d5a3a5b927a351fcfe6689ef1ba2b993db0c
Treehugger Robot [Wed, 27 Mar 2019 02:35:35 +0000 (02:35 +0000)]
Merge "Fix the INTERNET related permissions"
Lucas Lin [Wed, 27 Mar 2019 01:29:51 +0000 (01:29 +0000)]
Merge "Fix flaky test for ConnectivityServiceTest#testPartialConnectivity"
Treehugger Robot [Wed, 27 Mar 2019 00:34:25 +0000 (00:34 +0000)]
Merge "Fix missing combination check SINK/DEVICE"
Badhri Jagan Sridharan [Mon, 25 Mar 2019 18:02:44 +0000 (11:02 -0700)]
Fix missing combination check SINK/DEVICE
While checking for possible role combinations, the SINK/HOST combination
seems to be mistakenly checked twice intead of SINK/DEVICE.
This CL fixes this. The code now checks for:
1. source & host
2. sink & host
3. source & device
4. sink & device
Bug:
119142682
Change-Id: I5e652fbf9313bd2c122fe728d58e577085632253
Merged-In: I5e652fbf9313bd2c122fe728d58e577085632253
Chenbo Feng [Fri, 8 Mar 2019 19:55:12 +0000 (11:55 -0800)]
Fix the INTERNET related permissions
Change the INTERNET permission implementation so it only block socket
creation when non of the packages under the same uid have internet
permission. Fix the UPDATE_DEVICE_STATS permission so only the uid that
own the permission can change it.
Bug:
111560570
Test: CtsNetTestCasesUpdateStatsPermission
CtsNetTestCasesInternetPermission
Change-Id: I42385526c191d4429f486cde01293b27fcc1374b
Treehugger Robot [Tue, 26 Mar 2019 22:10:58 +0000 (22:10 +0000)]
Merge "Hide blocking pay phone option use carrier config"
Amit Mahajan [Tue, 26 Mar 2019 21:18:23 +0000 (21:18 +0000)]
Merge "Device could not use wifi hotspot when data card switch to sim2"
Siarhei Vishniakou [Mon, 25 Mar 2019 22:38:11 +0000 (15:38 -0700)]
Move tag definitions into policy
Currently, the tags are defined in system/core.
Instead, reserve a range in system/core and define the tags in policy.
Next, we add a flag for interceptKeyBeforeQueueing.
Bug:
128933363
Test: adb logcat -b events, turn on screen, then press power button and
observe the logs.
Change-Id: I1fde2a2e7451ec67987ad3b09abc28be64410427
Merged-In: I1fde2a2e7451ec67987ad3b09abc28be64410427
Treehugger Robot [Tue, 26 Mar 2019 18:30:30 +0000 (18:30 +0000)]
Merge "Add bluetooth icon."
Treehugger Robot [Tue, 26 Mar 2019 17:32:22 +0000 (17:32 +0000)]
Merge "Rename WM test filter to FrameworksTestsFilter"
Tadashi G. Takaoka [Tue, 26 Mar 2019 10:19:01 +0000 (19:19 +0900)]
Rename WM test filter to FrameworksTestsFilter
This CL adds Window Manager related tests of FrameworksServicesTests
to the test filter, and adds a comment to each tests mentioning about
FrameworksTestsFilter.
Test: Pass all 85 non-flaky presubmit tests of FrameworksCoreTests specified
in FrameworksTestsFilter.
$ tradefed.sh run commandAndExit FrameworksCoreTests \
--instrumentation-arg filter=com.android.server.wm.test.filters.FrameworksTestsFilter
--include-annotation android.platform.test.annotations.Presubmit \
--exclude-annotation androidx.test.filters.FlakyTest
Test: Pass all 133 non-flaky presubmit tests of FrameworksServicesTests
specified in FrameworksTestsFilter.
$ tradefed.sh run commandAndExit FrameworksServicesTests \
--instrumentation-arg filter=com.android.server.wm.test.filters.FrameworksTestsFilter
--include-annotation android.platform.test.annotations.Presubmit \
--exclude-annotation androidx.test.filters.FlakyTest
Test: Pass all 162 non-flaky presubmit tests of FrameworksServicesTests
specified as under package com.android.server.wm.
$ tradefed.sh run commandAndExit FrameworksServicesTests \
--instrumentation-arg selectTest=com.android.server.wm. \
--instrumentation-arg filter=com.android.server.wm.test.filters.FrameworksTestsFilter
--include-annotation android.platform.test.annotations.Presubmit \
--exclude-annotation androidx.test.filters.FlakyTest
Bug:
122451194
Change-Id: I9592ff01158eec1b4ef4d0dd22be243e10bd198e
Merged-In: I9592ff01158eec1b4ef4d0dd22be243e10bd198e
Amin Shaikh [Thu, 14 Mar 2019 16:33:19 +0000 (16:33 +0000)]
Add bluetooth icon.
Add accent_device_default that uses the light/dark variant based on
light/dark ui mode.
Bug:
126425594
Change-Id: I08640cc161b6d63da42c3f03df7cf41b182b005e
Test: make
Anton Hansson [Tue, 26 Mar 2019 12:39:09 +0000 (12:39 +0000)]
Merge "Move EmergencyInfo perm whitelist to /product"
lucaslin [Tue, 26 Mar 2019 09:49:49 +0000 (17:49 +0800)]
Fix flaky test for ConnectivityServiceTest#testPartialConnectivity
There are 2 problems will make testPartialConnectivity flaky:
1. If we call setNetworkValid() before expectCapabilitiesWith(),
there may be a timing issue that network will become VALID before
NetworkMonitor send PARTIAL_CONNECTIVITY to ConnectivityService.
Solution:
We should set network to valid after ConnectivityService received
NETWORK_TEST_RESULT_PARTIAL_CONNECTIVITY to ensure NetworkMonitor
will send PARTIAL_CONNECTIVITY to ConnectivityService first then
send VALID.
2. When test case call explicitlySelected(true) first then call
connect(true), NetworkMonitor will report the network validation
test result twice because ConnectivityServiceTest() will trigger
notifyNetworkTested() when setAcceptPartialConnectivity() is
called, it may cause a timing that before the second test result
send to ConnectivityService, connect() already called
setNetworkInvalid. So, NET_CAPABILITY_VALIDATED will be removed
and ConnectivityService will trigger onCapabilitiesChanged()
unexpectedly.
Solution:
Don't trigger notifyNetworkTested() when
setAcceptPartialConnectivity() is called. If there is needed,
use mCm.reportNetworkConnectivity() to report the test result
instead.
Bug:
128426024
Test: 1. atest FrameworksNetTests: \
ConnectivityServiceTest#testPartialConnectivity \
--generate-new-metrics 1000
Change-Id: I7200528378201a3c7c09a78ff827b41f2741dfa1
Treehugger Robot [Tue, 26 Mar 2019 09:28:08 +0000 (09:28 +0000)]
Merge "DO NOT MERGE Fix CtsActivityManagerDeviceTestCases fails"
Junyu Lai [Tue, 26 Mar 2019 06:38:39 +0000 (06:38 +0000)]
Merge "Reveal the call trace of failed test cases which run in executors"
Ruoyao Liu [Mon, 21 Jan 2019 03:36:18 +0000 (11:36 +0800)]
Enable more logs for networking
Sometimes we would encounter problems that happen by chance and
hard to reproduce. So we recommend to enable more logs in ENG and
UESRDEBUG load by default.
Bug:
123256412
Test: android.net.ip.IpClientTest can pass
Change-Id: Ia3363de96966a4e86ab550c768fb70317da005ed
Remi NGUYEN VAN [Tue, 26 Mar 2019 02:40:34 +0000 (11:40 +0900)]
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
Treehugger Robot [Mon, 25 Mar 2019 21:00:07 +0000 (21:00 +0000)]
Merge "Fix potential NPE in telephony registry dumpsys."
Anton Hansson [Mon, 25 Mar 2019 19:41:53 +0000 (19:41 +0000)]
Move EmergencyInfo perm whitelist to /product
The app is moving to /product, to separate out its permission
grants to a separate file and move that file to /product as well.
Bug:
122353713
Test: boot aosp_arm64 emulator
Change-Id: Ic165aae180a002c3566e3c1b1495a1d50dfd0e4a
Treehugger Robot [Mon, 25 Mar 2019 16:38:20 +0000 (16:38 +0000)]
Merge "Make SelectTest append selectTest argument from extended class"
Treehugger Robot [Mon, 25 Mar 2019 14:43:37 +0000 (14:43 +0000)]
Merge "Add to sysui owners"
Tyler Gunn [Mon, 25 Mar 2019 14:26:33 +0000 (07:26 -0700)]
Fix potential NPE in telephony registry dumpsys.
There is no guarantee that mImsCallDisconnectCause will be non-null, so
we should not be calling toString here.
Test: Compile/build
Fixes:
129251351
Change-Id: I8b983ce8fa7f5316bc474ffbd67052ae0df4d75d
Treehugger Robot [Mon, 25 Mar 2019 13:19:19 +0000 (13:19 +0000)]
Merge "Add nullability annotations"
Tadashi G. Takaoka [Fri, 22 Mar 2019 08:21:51 +0000 (17:21 +0900)]
Make SelectTest append selectTest argument from extended class
This CL also moves CoreTestsFilter to frameworks/base/tests/utils, so
that FrameworksCoreTests, FrameworksServicesTests, and WmTests can use
CoreTestsFilter.
Test: Pass SelectTestTests
$ atest WmTests:com.android.test.filters.SelectTestTests
Test: Pass all 85 WM related non-flaky presubmit tests in FrameworksCoreTests
using CoreTestsFilter
$ tradefed.sh run commandAndExit FrameworksCoreTests \
--instrumentation-arg selectTest=com.android.server.wm.,com.android.server.am. \
--instrumentation-arg filter=com.android.server.wm.test.filters.CoreTestsFilter
--include-annotation android.platform.test.annotations.Presubmit \
--exclude-annotation androidx.test.filters.FlakyTest
Test: Pass all 293 WM related non-flaky presubmit tests in
FrameworksServicesTests using CoreTestsFilter
$ tradefed.sh run commandAndExit FrameworksServicesTests \
--instrumentation-arg selectTest=com.android.server.wm.,com.android.server.am. \
--instrumentation-arg filter=com.android.server.wm.test.filters.CoreTestsFilter
--include-annotation android.platform.test.annotations.Presubmit \
--exclude-annotation androidx.test.filters.FlakyTest
Bug:
122451194
Change-Id: I83d13d9ef82a92677bee67da5ee8a5faa0690f82
Merged-In: I83d13d9ef82a92677bee67da5ee8a5faa0690f82
Mark Chien [Mon, 25 Mar 2019 13:10:17 +0000 (13:10 +0000)]
Merge "[TCPKeepalive] Fill correct TOS and TTL value"
junyulai [Tue, 19 Mar 2019 10:50:23 +0000 (18:50 +0800)]
Reveal the call trace of failed test cases which run in executors
Currently, the fails in testTcpSocketKeepalives are triggered by
fail() inside the executor, which is hiding the actual call trace
but only message remains. And it made the fail case hard to
debug.
So this commit is to bubble up the Exception by using a custom
functional interface.
Bug:
123987272
Test: 1. atest FrameworksNetTests
2. manually fail the test case and see the call trace
Change-Id: I125e673938a5e9d1de86f83c1a732227a4bd3207
Junyu Lai [Mon, 25 Mar 2019 10:42:37 +0000 (10:42 +0000)]
Merge "Fix SocketKeepalive APIs which do not meet API review requirement"
Treehugger Robot [Mon, 25 Mar 2019 10:29:22 +0000 (10:29 +0000)]
Merge "Add nullable annotations to startActivityAsUser"
Treehugger Robot [Mon, 25 Mar 2019 08:48:03 +0000 (08:48 +0000)]
Merge "Add Looper.prepare() to doInBackground()"
Nandana Dutt [Mon, 25 Mar 2019 08:43:43 +0000 (08:43 +0000)]
Merge "Stop bugreportd if binder call fails"
Remi NGUYEN VAN [Mon, 25 Mar 2019 07:59:27 +0000 (16:59 +0900)]
Add nullable annotations to startActivityAsUser
This change is already in internal branches.
Test: m
Bug:
128935825
Change-Id: I6f6c939c26215fbc113a6edafbdf865d365c9105
Merged-In: I9b61d833a68528f168611c83a8539eb095a42e01
junyulai [Mon, 4 Mar 2019 14:45:36 +0000 (22:45 +0800)]
Fix SocketKeepalive APIs which do not meet API review requirement
Per API review, change the use of FileDescriptor to
ParcelFileDescriptor.
This change also fix nullability according to API review
feedbacks.
Fix:
126698610
Fix:
126699425
Fix:
126699232
Fix:
126700278
Test: 1. m -j
2. atest FrameworksNetTests --generate-new-metrics 50
3. m -j doc-comment-check-docs
Change-Id: I19476c50dd1ca290bf3f41973829da2bd229796a
Remi NGUYEN VAN [Mon, 25 Mar 2019 07:41:08 +0000 (16:41 +0900)]
Add nullability annotations
Add nullability annotations on the following methods:
- StaticIpConfiguration#getRoutes
- ValidationProbeEvent#getProbeName
Test: m
Bug:
128935825
Change-Id: I1c17d200f3125e684c4e4d67b2f7f079eda310b6
Remi NGUYEN VAN [Mon, 25 Mar 2019 07:40:33 +0000 (07:40 +0000)]
Merge "Compile NetworkStack resources only once"
Jack Yu [Mon, 25 Mar 2019 06:21:44 +0000 (14:21 +0800)]
Update Android Beam deprecated API description
Bug:
127532226
Test: None
Change-Id: Id3a769c4cf97bbaee751fd5dc0831bdc5993ef50
Mark Chien [Mon, 25 Mar 2019 03:48:02 +0000 (03:48 +0000)]
Merge "Fix the race between carrier config and DDS change"
markchien [Thu, 21 Mar 2019 14:26:54 +0000 (22:26 +0800)]
[TCPKeepalive] Fill correct TOS and TTL value
Fill correct TOS/TTL value by fetching them from kernel with
getsockopt.
bug:
123967966
Test: -build, flash, boot
-atest FrameworksNetTests
Change-Id: I75b1be51040b4a381163958b4cddd27dbb22bac1
Remi NGUYEN VAN [Wed, 20 Mar 2019 07:40:54 +0000 (16:40 +0900)]
Compile NetworkStack resources only once
The current build files would compile resources both for the
android_library and the android_app build rules, since the android_app
build rule resource_dirs default to ["res"]. Set resource_dirs to [] for
these build rules so that resources are only inherited from the
android_library.
Also refactor the build file using java_defaults to avoid repeating
configuration.
Test: flashed, boots, WiFi working
Bug:
127908503
Change-Id: Ie51dd1bd1a8ee5145e3f1b95beb1de59665b4c51
Remi NGUYEN VAN [Mon, 25 Mar 2019 02:50:37 +0000 (02:50 +0000)]
Merge "Separate NetworkMonitor/framework portal URL"
Treehugger Robot [Mon, 25 Mar 2019 02:37:28 +0000 (02:37 +0000)]
Merge "Fix API in CaptivePortal and ConnectivityManager"
Chiachang Wang [Mon, 25 Mar 2019 02:16:16 +0000 (02:16 +0000)]
Merge "Add network stack proto"