OSDN Git Service
Remi NGUYEN VAN [Fri, 12 Apr 2019 09:05:40 +0000 (09:05 +0000)]
Revert "Block incoming non-VPN packets to apps under fully-routed VPN"
This reverts commit
fd8f96d71925cc80f5052365af2e5150cc0ec3ca.
This change does not have any topic: not reverting the other 2 commits in the original topic.
Reason for revert: broke FrameworksNetTests presubmit: b/
130397860
Change-Id: Iff41d9fe97fafea44680c8d67d1ce19277548cc0
Rubin Xu [Tue, 8 Jan 2019 22:03:26 +0000 (22:03 +0000)]
Block incoming non-VPN packets to apps under fully-routed VPN
When a fully-routed VPN is running, we want to prevent normal apps
under the VPN from receiving packets originating from any local non-VPN
interfaces. This is achieved by using eBPF to create a per-UID input
interface whitelist and populate the whitelist such that all
non-bypassable apps under a VPN can only receive packets from the VPN's
TUN interface (and loopback implicitly)
This is the framework part of the change that build the whitelist.
The whitelist needs to be updated in the following cases:
* When a VPN is connected and disconnected
This will cover the change to allowBypass bit, since that can't be
changed without reconnecting.
* When a VPN's NetworkCapabilites is changed (whitelist/blacklist app changes)
* When a new app is installed
* When an existing app is removed
* When a VPN becomes fully-routed or is no longer fully-routed
New user/profile creation will automatically result in a whitelist app change
transition so it doesn't need to be handled specially here.
Due to the limitation of the kernel IPSec interacting with eBPF (sk_buf->ifindex
does not point to the virtual tunnel interface for kernel IPSec), the whitelist
will only apply to app VPNs but not legacy VPN connections, to prevent breaking
connectivity with kernel IPSec entirely.
Test: atest PermissionMonitorTest
Test: atest android.net.RouteInfoTest
Test: atest com.android.server.ConnectivityServiceTest
Test: atest HostsideVpnTests
Bug:
114231106
Change-Id: I143b03d60e46cb1b04732b4a4034f5847b4d1b1a
Neil Fuller [Tue, 9 Apr 2019 17:45:29 +0000 (17:45 +0000)]
Merge "Switch to HexEncoding from ByteStringUtils"
Shuo Qian [Tue, 9 Apr 2019 17:29:19 +0000 (17:29 +0000)]
Merge "Use Received Uri as Gateway Uri"
Benedict Wong [Tue, 9 Apr 2019 17:22:56 +0000 (17:22 +0000)]
Merge "Fix remove-before-add for IpSecService RefcountedResource"
Treehugger Robot [Tue, 9 Apr 2019 16:29:13 +0000 (16:29 +0000)]
Merge "Create new RcsThreadQueryResultParcelable"
vichang [Tue, 9 Apr 2019 12:23:19 +0000 (12:23 +0000)]
Merge "Remove the feature flag for time zone picker"
Junyu Lai [Tue, 9 Apr 2019 12:13:26 +0000 (12:13 +0000)]
Merge "Fix onBlockedStatusChanged does not work on multiple networks"
Chalard Jean [Tue, 9 Apr 2019 12:06:03 +0000 (12:06 +0000)]
Merge "Move the latest AIDL update to the bottom"
Neil Fuller [Tue, 9 Apr 2019 09:50:59 +0000 (09:50 +0000)]
Merge "Switch to HexEncoding from ByteStringUtils"
Neil Fuller [Mon, 8 Apr 2019 21:03:14 +0000 (22:03 +0100)]
Switch to HexEncoding from ByteStringUtils
Migration in preparation for deletion of ByteStringUtils.
Bug:
124232146
Test: build only
Merged-In: I07983ca596443a3e00616b63355c6504376f3e7c
Change-Id: I07983ca596443a3e00616b63355c6504376f3e7c
Treehugger Robot [Tue, 9 Apr 2019 06:50:43 +0000 (06:50 +0000)]
Merge "ActivityManager: process stop needs a process to stop"
Chalard Jean [Tue, 9 Apr 2019 05:51:18 +0000 (05:51 +0000)]
Merge "Address leftover comments on aosp/894233"
Treehugger Robot [Tue, 9 Apr 2019 05:42:12 +0000 (05:42 +0000)]
Merge "Mainline logging to statsd: native static libs"
Remi NGUYEN VAN [Tue, 9 Apr 2019 04:37:48 +0000 (04:37 +0000)]
Merge "Expose captive portal urls for configuration"
Xin Li [Tue, 9 Apr 2019 04:29:22 +0000 (04:29 +0000)]
Merge "DO NOT MERGE -- Merge PPRL.190405.003 into master"
Chalard Jean [Mon, 8 Apr 2019 11:28:44 +0000 (20:28 +0900)]
Address leftover comments on aosp/894233
Bug:
129510344
Test: m, boots, wifi connects, resolves DNS
Change-Id: Idf24f42a86bbfcc89e3ea8cf50d1b705d72ac613
Lorenzo Colitti [Tue, 9 Apr 2019 02:45:42 +0000 (02:45 +0000)]
Merge "Don't leak captive portal broadcast receivers."
Xin Li [Tue, 9 Apr 2019 01:56:15 +0000 (18:56 -0700)]
DO NOT MERGE -- Merge PPRL.190405.003 into master
Bug:
130175407
Change-Id: I0f7d294680477f7ee8b25d2b8622f3ff05bc4f41
Benedict Wong [Fri, 1 Mar 2019 04:28:48 +0000 (20:28 -0800)]
Fix remove-before-add for IpSecService RefcountedResource
This patch fixes a bug where if a binder dies before the linkToDeath
call, the cleanup will be performed before the entry is added to the
array. While it is safe in that quotas and tracking performs as per
normal, the RefcountedRecord may not be cleaned up.
Rethrowing this exception is safe, since the only paths that would hit
this are all on binder threads coming from applications. Further, it
seems there is only one real way of this getting hit - if the app that
called the creation died during the binder call.
Bug:
126802451
Test: Compiled, CTS tests passing
Change-Id: I6db75853da9f29e1573512e26351623f22770c5d
Treehugger Robot [Tue, 9 Apr 2019 01:35:15 +0000 (01:35 +0000)]
Merge "Removed log spam from the Zygote."
Niklas Lindgren [Fri, 7 Dec 2018 10:08:04 +0000 (11:08 +0100)]
Expose captive portal urls for configuration
Carriers in Mainland China need to customize certain captive portal
urls. The main issue is that google servers are not accessible in
Mainland China.
Added the following captive portal resources to be targeted for overlay.
- config_captive_portal_http_url
- config_captive_portal_https_url
- config_captive_portal_fallback_urls (string-array)
- config_captive_portal_fallback_probe_specs (string-array)
These values can be customized for e g diffent countries
Bug:
111819230
Test: atest FrameworksNetTests NetworkStackTests
Test: Add a product RRO that targets a specific country code,
insert a SIM card that matches that country code and check the log
what URL is used.
Change-Id: I38a294a5e14417f65e96e76235ea153c53c4d7cc
sqian [Sat, 6 Apr 2019 23:21:53 +0000 (16:21 -0700)]
Use Received Uri as Gateway Uri
Gateway information is the core component to perform redirection.
We should clarify the uri we received from
CallRedirectionService is gateway Uri. And apply it in Telecom.
Test: Treehugger; Manual
Bug:
130048865
Change-Id: I3599377406b88751ee11139e9a1aa5afab734f7c
Leland Miller [Fri, 22 Mar 2019 21:20:50 +0000 (14:20 -0700)]
Create new RcsThreadQueryResultParcelable
This parcelable class now backes RcsThreadQueryResult. This change will
allow injection of API layer dependencies into RcsThreadQueryResult.
Change-Id: I2c273513e2a3bfcab7cd84fc7a2f89cc2ad12c75
Test: Existing tests pass
Bug:
123699565
Chris Wailes [Mon, 8 Apr 2019 22:52:40 +0000 (15:52 -0700)]
Removed log spam from the Zygote.
This patch removes several debugging log messages. These messages were
useful when the `FDs to ignore` list was usually empty, but with the
addition of USAPs this has become spammy.
Test: Build
Bug:
130172109
Change-Id: Id166990a63f20efb3bf6ffd5b697efd436d50921
Nathan Harold [Mon, 8 Apr 2019 22:42:35 +0000 (22:42 +0000)]
Merge changes from topic "tdscdma-rscp"
* changes:
Fix getLevel for CellSignalStrengthTdscdma
Rename LevelCalculationMethod Constant
Xiangyu/Malcolm Chen [Mon, 8 Apr 2019 22:29:36 +0000 (22:29 +0000)]
Merge changes from topics "
126864501", "
129296702"
* changes:
Changing default phone capability.
Remove hidden IntDef in java doc.
Add @hide API to return whether a modem stack is enabled or not.
Jack Yu [Mon, 8 Apr 2019 21:19:54 +0000 (21:19 +0000)]
Merge "Fixed incorrect service state populated"
Neil Fuller [Mon, 8 Apr 2019 20:57:53 +0000 (21:57 +0100)]
Switch to HexEncoding from ByteStringUtils
Migration in preparation for deletion of ByteStringUtils.
Bug:
124232146
Test: build only
Change-Id: I9f18bb56eccf5bd628e1fd9068285f75623f7caf
Malcolm Chen [Fri, 29 Mar 2019 02:27:58 +0000 (19:27 -0700)]
Changing default phone capability.
Bug:
126864501
Test: manual
Change-Id: I3d50fb30980b5e2d2240bd186fb15c7f2a7c21ab
Merged-In: I3d50fb30980b5e2d2240bd186fb15c7f2a7c21ab
Malcolm Chen [Sat, 30 Mar 2019 01:30:23 +0000 (18:30 -0700)]
Remove hidden IntDef in java doc.
Bug:
128456336
Test: build
Change-Id: If016aabda5092d299eca2e858f26057614767297
Merged-In: If016aabda5092d299eca2e858f26057614767297
Malcolm Chen [Thu, 28 Mar 2019 02:21:11 +0000 (19:21 -0700)]
Add @hide API to return whether a modem stack is enabled or not.
Bug:
129296702
Test: TelephonyManagerTestApp
Change-Id: I7ef4ad8322cf85e5a159363e90dde303ac7240de
Merged-In: I7ef4ad8322cf85e5a159363e90dde303ac7240de
android-build-team Robot [Mon, 8 Apr 2019 18:00:14 +0000 (18:00 +0000)]
Snap for
5310204 from
1b1681a8b0a3f95062c8f6f7fe31890629264e37 to pi-platform-release
Change-Id: Id8efd34958658db735305602cdace27a8a73394a
Treehugger Robot [Mon, 8 Apr 2019 17:35:24 +0000 (17:35 +0000)]
Merge "Fix documentation of CallRedirectionService"
Jack Yu [Mon, 8 Apr 2019 08:10:27 +0000 (01:10 -0700)]
Fixed incorrect service state populated
ServiceState.setStateOutOfService does not correctly
clean up the information so the old WLAN registration info
got populated for the next time use.
Bug:
130048577
Test: Telephony sanity tests
Merged-In: I7fab7090c22390914af024c44bffd643c13f33e5
Change-Id: I7fab7090c22390914af024c44bffd643c13f33e5
(cherry picked from commit
9302618da657959c77943d2ecc7705ddf77612ba)
Lorenzo Colitti [Mon, 8 Apr 2019 08:14:35 +0000 (17:14 +0900)]
Don't leak captive portal broadcast receivers.
Since aosp/937885, mLaunchCaptivePortalAppBroadcastReceiver is
nulled out, but not unregistered, when exiting MaybeNotifyState.
This causes the BroadcastReceiver to be leaked because it is no
longer unregistered when processing CMD_NETWORK_DISCONNECTED.
Fix this by unregistering the receiver in MaybeNotifyState#exit.
Also remove the unregister call in CMD_NETWORK_DISCONNECTED: it
is no longer necessary, because StateMachine, before quitting,
will call the exit method of the current state and all its
parent states.
Bug:
122164725
Test: atest FrameworksNetTests NetworkStackTests
Change-Id: I447b3cfd3821dda19482ed962dd59ec61fc5fc9b
Treehugger Robot [Mon, 8 Apr 2019 10:19:26 +0000 (10:19 +0000)]
Merge "Add FrameworksNetTests dependency on libcgrouprc"
Orion Hodson [Mon, 8 Apr 2019 09:12:02 +0000 (10:12 +0100)]
ActivityManager: process stop needs a process to stop
Make process a required argument for am process stop to avoid silent
failure.
Minor usage clean-up for am process commands.
Bug:
129892812
Test: manual
Change-Id: Ib5f3c225c79af65f66c22b24abbef210bb383c8e
junyulai [Mon, 8 Apr 2019 08:58:22 +0000 (16:58 +0800)]
Fix onBlockedStatusChanged does not work on multiple networks
There is a logic error in maybeNotifyNetworkBlockedForNewUidRules
that caused function to return if there is no status change in
the first network. This would cause CTS failed in devices which
has volte-enabled SIM inserted.
Bug:
129409153
Fix:
117969394
Test: 1. atest com.android.cts.net.HostsideNetworkCallbackTests \
--generate-new-metrics 20
2. atest FrameworksNetTests
Change-Id: Ifd18d1c6ad708c1dbc793f03d8241f572af50317
Remi NGUYEN VAN [Mon, 8 Apr 2019 08:29:06 +0000 (17:29 +0900)]
Add FrameworksNetTests dependency on libcgrouprc
The tests are currently broken without this dependency.
Bug:
129902619
Test: atest FrameworksNetTests
Merged-In: Ifcfe4df81caf8ede2e4e66a76552cb3200378fa8
Change-Id: I85891485157ed86e069039dfe3092028ff703dd5
Treehugger Robot [Mon, 8 Apr 2019 05:00:25 +0000 (05:00 +0000)]
Merge "Fix exception of unregisterCallback when callback is not registered"
Lucas Lin [Mon, 8 Apr 2019 04:37:47 +0000 (04:37 +0000)]
Merge "Prevent SIGN_IN notification pop up several times"
lucaslin [Mon, 8 Apr 2019 02:52:46 +0000 (10:52 +0800)]
Prevent SIGN_IN notification pop up several times
SIGN_IN notification may pop up several times before user
logged in the network if someone trigger
ConnectivityService#reportNetworkConnectivity().
Add a boolean to make sure SIGN_IN notification will only pop up
once to user before user logged in.
Bug: b/
122164725
Test: Build pass.
Change-Id: I9c7f1d47fde8e5dfadd6646497023b05f3b0ed88
Treehugger Robot [Mon, 8 Apr 2019 01:40:55 +0000 (01:40 +0000)]
Merge "Add NetworkStackTests dependency on libdl_android"
Treehugger Robot [Sun, 7 Apr 2019 23:48:32 +0000 (23:48 +0000)]
Merge "Extend support for requestRouteToHostAddress for backward compatibility"
Lorenzo Colitti [Sun, 7 Apr 2019 23:46:39 +0000 (23:46 +0000)]
Merge "Disable InetDiagSocketTest in a better way."
Shuo Qian [Sun, 7 Apr 2019 05:02:36 +0000 (05:02 +0000)]
Merge "Clean up Call redirection setting"
sqian [Fri, 29 Mar 2019 02:14:35 +0000 (19:14 -0700)]
Clean up Call redirection setting
Test: Treehugger
Bug:
123038126
Change-Id: I9cb569bfd1ef5fba7958bb2e5f42f05e300e3358
Merged-In: I9cb569bfd1ef5fba7958bb2e5f42f05e300e3358
sqian [Fri, 5 Apr 2019 16:21:31 +0000 (09:21 -0700)]
Fix documentation of CallRedirectionService
Test: sanity
Bug:
130026756
Change-Id: I48f60b3c4a465e22250aa513a4d7d73f82375426
Merged-In: I48f60b3c4a465e22250aa513a4d7d73f82375426
(cherry picked from commit
87833ee8679873b55654939eebcc3dbd3b6ebc11)
Tobias Thierer [Sat, 6 Apr 2019 14:21:32 +0000 (14:21 +0000)]
Merge changes I4e32a588,I202c5653
* changes:
Make MediaHTTPConnection thread safe.
Revert "MediaHTTPConnection: move connection states into an inner class"
Remi NGUYEN VAN [Fri, 29 Mar 2019 05:49:02 +0000 (14:49 +0900)]
Add NetworkStackTests dependency on libdl_android
This fixes tests that were failing because of the unsatisfied
dependency.
Test: atest NetworkStackTests
Bug:
129387775
Change-Id: Ie0c1bc2b292ad7172d144d9e7ad9edeecd2232b7
(cherry picked from commit
329c4dadbe92deae9741010bf3e31eb7d70ba899)
Jack Yu [Fri, 5 Apr 2019 20:30:46 +0000 (20:30 +0000)]
Merge "Improved the debug message"
Treehugger Robot [Fri, 5 Apr 2019 20:29:38 +0000 (20:29 +0000)]
Merge "Fix for NetworkStats/Telephony deadlock"
Treehugger Robot [Fri, 5 Apr 2019 19:27:22 +0000 (19:27 +0000)]
Merge "Move NetworkStatsFactory into service directory"
Nathan Harold [Fri, 5 Apr 2019 18:47:37 +0000 (18:47 +0000)]
Merge "Opportunistic Sub Grouping Keys in CarrierConfig"
Tor Norbye [Fri, 5 Apr 2019 18:44:55 +0000 (18:44 +0000)]
Merge "Revert "Revert "Update MbmsDownloadServiceBase to reflect implements IInterface"""
Anil Admal [Fri, 5 Apr 2019 17:06:37 +0000 (10:06 -0700)]
Extend support for requestRouteToHostAddress for backward compatibility
The gnss@2.0 HAL and the framework GNSS Location Provider code is
updated in Q to not call the deprecated requestRouteToHost() method.
However, devices upgrading to Q which are still using gnss@1.1 or
earlier HAL must continued to be supported.
Fixes:
121222025
Test: Tested with gnss@1.1 HAL and first API level P. The
ConnectivityService log message "This method exists only for
app backwards compatibility and must not be called by system
services" is not present for devices with first API level P.
Change-Id: I10199776ea413dc256dbf0771e6cb3eedb334495
Jack Yu [Thu, 4 Apr 2019 22:10:17 +0000 (15:10 -0700)]
Improved the debug message
Improved the log readability by printed out data state
in string format instead of integer. Also added listen
local log.
Bug:
129631771
Test: Manual
Merged-In: If786d51b35380f606bc388e29a441bb24a2792e0
Change-Id: If786d51b35380f606bc388e29a441bb24a2792e0
(cherry picked from commit
0c92c2395124c95acc9d0e184ff8d472bd562245)
Treehugger Robot [Fri, 5 Apr 2019 16:45:49 +0000 (16:45 +0000)]
Merge "Add dependency on libdl_android"
Neil Fuller [Fri, 5 Apr 2019 16:18:42 +0000 (16:18 +0000)]
Merge "Track ErrnoException API changes in libcore"
Treehugger Robot [Fri, 5 Apr 2019 15:25:47 +0000 (15:25 +0000)]
Merge "Don't set sehash when calling restoreconRecursive"
Sungsoo Lim [Fri, 5 Apr 2019 13:10:03 +0000 (13:10 +0000)]
Merge "DO NOT MERGE: Fix system_server watchdog timeout"
Treehugger Robot [Fri, 5 Apr 2019 09:35:11 +0000 (09:35 +0000)]
Merge "zygote: initialize ashmem early"
Treehugger Robot [Fri, 5 Apr 2019 09:26:21 +0000 (09:26 +0000)]
Merge "Fix BT keeping wrong state issue"
Chalard Jean [Fri, 5 Apr 2019 07:38:21 +0000 (16:38 +0900)]
Move the latest AIDL update to the bottom
Test: m
Change-Id: I3818eb8abb5a410663a6da633d5516cef4ecad8e
Remi NGUYEN VAN [Fri, 5 Apr 2019 07:30:02 +0000 (07:30 +0000)]
Merge "Add a mechanism to pass the L2Key and group hint to IpClient"
Remi NGUYEN VAN [Fri, 5 Apr 2019 07:13:54 +0000 (07:13 +0000)]
Merge "Remove SocketUtils#setSocketTimeValueOption"
Treehugger Robot [Fri, 5 Apr 2019 06:50:43 +0000 (06:50 +0000)]
Merge "Add Vts test for xsd_config"
Remi NGUYEN VAN [Fri, 5 Apr 2019 06:38:08 +0000 (06:38 +0000)]
Merge "Move attach*Filter() and addArpEntry() methods to NetworkStack"
Treehugger Robot [Fri, 5 Apr 2019 04:59:14 +0000 (04:59 +0000)]
Merge "Convert core/tests/BroadcastRadioTests/Android.mk file to Android.bp"
Chalard Jean [Fri, 15 Mar 2019 14:10:40 +0000 (23:10 +0900)]
Add a mechanism to pass the L2Key and group hint to IpClient
Test: IpClientTest
Change-Id: I399b20ce29a385a74971b7a7248a48cb4d66deb6
Amith Yamasani [Tue, 19 Feb 2019 17:57:32 +0000 (09:57 -0800)]
Fix for NetworkStats/Telephony deadlock
Call into NetworkStatsService to update uid foreground
state without the NPMS lock held. Both calls are from
the handler thread, so no sequencing issues.
Bug:
123274986
Bug:
74007921
Test: atest CtsHostsideNetworkTests
Change-Id: I9e8449e5a75db616e646f55c930ff82982fc9083
Merged-In: I9e8449e5a75db616e646f55c930ff82982fc9083
Remi NGUYEN VAN [Fri, 5 Apr 2019 01:54:08 +0000 (01:54 +0000)]
Merge "Call clearCallingIdentity before notifyDnsResponse"
Treehugger Robot [Fri, 5 Apr 2019 00:36:00 +0000 (00:36 +0000)]
Merge "Change to choice"
Tim Murray [Thu, 4 Apr 2019 16:19:03 +0000 (09:19 -0700)]
zygote: initialize ashmem early
avoids dlopen of ashmemd_client in every app startup.
Test: boots, works, doesn't dlopen in app startup
Bug:
129543489
Change-Id: I76ba230af30cd007dbbca054e06660e8a30aca36
Nick Kralevich [Thu, 4 Apr 2019 22:54:58 +0000 (15:54 -0700)]
Don't set sehash when calling restoreconRecursive
restorecon_recursive updates the SELinux label of the files in the
filesystem, and then attempts to write the xattr "security.sehash" as an
optimization for future restorecons. Writing security.* extended
attributes requires CAP_SYS_ADMIN, which system_server doesn't have (and
shouldn't have).
Suppress the computation and writing of the hash value. It's not
needed.
This bug has been around for a long time, but due to the fix for
bug
62302954, the error message is being generated more frequently
now.
TODO: It would be better if the default for restorecon was to suppress
the hash computation, since otherwise it encourages programs to be
overprivileged with CAP_SYS_ADMIN. I'll plan on doing that in a followup
commit.
Bugs where this error message has been called out:
Bug:
129766333
Bug:
129271240
Bug:
128700692
Bug:
129925723
Test: install an APK and ensure that no "SELinux: setxattr failed"
error messages are generated.
Change-Id: I83f4f225e4e73453daea42dbcabf0f8a06d320d6
Steven Moreland [Thu, 4 Apr 2019 23:10:04 +0000 (23:10 +0000)]
Merge "ApplicationLoaders: hard failures & tests"
Sasha Smundak [Wed, 3 Apr 2019 17:38:02 +0000 (10:38 -0700)]
Convert core/tests/BroadcastRadioTests/Android.mk file to Android.bp
Cherrypick of https://googleplex-android-review.git.corp.google.com/c/platform/frameworks/base/+/
6924098
See build/soong/README.md for more information.
Bug:
122332340
Test: treehugger
Change-Id: I8d270949cb2dd4391ceeaf57ea8557be849c9ed8
Merged-In: I8d270949cb2dd4391ceeaf57ea8557be849c9ed8
Tyler Gunn [Thu, 4 Apr 2019 19:35:10 +0000 (19:35 +0000)]
Merge "Remove call identification APIs."
Treehugger Robot [Thu, 4 Apr 2019 19:27:20 +0000 (19:27 +0000)]
Merge "Convert core/tests/**/Android.mk file to Android.bp"
Tyler Gunn [Thu, 4 Apr 2019 18:26:29 +0000 (18:26 +0000)]
Merge "Add @hide API to get the phone account handle for a subId."
Treehugger Robot [Thu, 4 Apr 2019 15:55:11 +0000 (15:55 +0000)]
Merge "Convert core/tests/featureflagtests/Android.mk file to Android.bp"
Neil Fuller [Tue, 2 Apr 2019 19:12:33 +0000 (20:12 +0100)]
Track ErrnoException API changes in libcore
See the associated change in libcore.
Bug:
129935077
Test: See libcore/ change
Change-Id: I68a98df35f070db31fa3eb2967d7fab0a78d0ecf
Treehugger Robot [Thu, 4 Apr 2019 12:29:44 +0000 (12:29 +0000)]
Merge "Add common tests for FrameworksBaseTests and CTS"
Remi NGUYEN VAN [Thu, 4 Apr 2019 07:12:51 +0000 (16:12 +0900)]
Remove SocketUtils#setSocketTimeValueOption
This API was added in Q but is not necessary anymore as
Os#setsockoptTimeval was exposed as public API.
Test: m
Fixes:
129433363
Change-Id: Ifd04c0314f7f7c0dbd0ed89dbaf69b9c152d3330
Lorenzo Colitti [Thu, 4 Apr 2019 08:09:06 +0000 (08:09 +0000)]
Merge "Fix flaky UdpEncapsulationSocket test"
Sungsoo Lim [Thu, 4 Apr 2019 08:00:00 +0000 (17:00 +0900)]
DO NOT MERGE: Fix system_server watchdog timeout
AudioPlayerStateMonitor can't implement IPlaybackConfigDispatcher.Stub
directly, instead it needs to go through AudioManager to prevent
potential deadlock.
Bug:
124415216
Test: build
Change-Id: Id2ef99ed6271ceb63a27f895a6c08f79d60ba7eb
Lorenzo Colitti [Thu, 4 Apr 2019 01:24:54 +0000 (10:24 +0900)]
Disable InetDiagSocketTest in a better way.
Test: treehugger
Bug:
124354087
Bug:
128024100
Change-Id: I3048625a2507e70402ce376e7208f58cdf5ddfba
Colin Cross [Thu, 4 Apr 2019 04:00:13 +0000 (04:00 +0000)]
Merge "Export framework-res raw resources to robolectric"
Treehugger Robot [Thu, 4 Apr 2019 03:48:29 +0000 (03:48 +0000)]
Merge "Temporarily disable InetDiagSocketTest."
Tyler Gunn [Wed, 3 Apr 2019 22:26:05 +0000 (15:26 -0700)]
Add @hide API to get the phone account handle for a subId.
This is used in SubscriptionManager to figure out which phone account
is being updated when the default voice sub changes. It seemed like
a good spot to put it since we should really have an api for this in
the future.
Test: Manual, manual, manual
Bug:
128916238
Change-Id: If5137c0e7f01a14810e0ee94e5d857d69f368a87
Nathan Harold [Tue, 12 Mar 2019 22:51:42 +0000 (15:51 -0700)]
Opportunistic Sub Grouping Keys in CarrierConfig
Add two keys to allow new subscriptions to be added
into subscription groups before carrier config changes
are broadcast.
Bug:
123721160
Test: atest SubscriptionInfoUpdaterTest
Change-Id: Ib6f811b70e41eba897b9bde0c0aeb0c880169f66
Lorenzo Colitti [Thu, 4 Apr 2019 01:24:54 +0000 (10:24 +0900)]
Temporarily disable InetDiagSocketTest.
This test is too flaky to run in presubmits.
Bug:
124354087
Test: atest InetDiagSocketTest
Change-Id: I90bc52a6f5b92d634862e3464634dfdbd3cada6a
Chen Xu [Thu, 4 Apr 2019 01:53:53 +0000 (01:53 +0000)]
Merge "scrub pii (imsi) from carrierIdentifier logging"
Sundong Ahn [Wed, 27 Mar 2019 06:02:28 +0000 (15:02 +0900)]
Change to choice
The sequence element is changed to choice element with minOccurs="0" and
maxOccurs="unbounded" for supporting any order and any times sub
element. And maxOccurs of subelement is deleted because maxOccurs are
not needed.
Bug:
127435354
Test: m -j
Change-Id: I72866da5b2a8ac37d725f5b604dae37a06f30162
Yifan Hong [Thu, 4 Apr 2019 01:21:34 +0000 (01:21 +0000)]
Merge "Fix NetworkStackTests."
Yifan Hong [Thu, 4 Apr 2019 01:15:22 +0000 (18:15 -0700)]
Fix NetworkStackTests.
NetworkStackTests dlopens library which indirectly
uses libcgrouprc. Add it to jni_libs.
Test: atest
Fixes:
129902619
Change-Id: I0d60d7a317fa60607d6fdaea15f61b458aefd2f0
Benedict Wong [Wed, 20 Mar 2019 16:44:09 +0000 (09:44 -0700)]
Fix flaky UdpEncapsulationSocket test
This commit reduces the flakiness of the
testOpenAndCloseUdpEncapsulationSocket by retrying up to three times.
Unfortunately, testing port-selected socket creation is racy against
other applications. This helps to handle the same race condition as done
in IpSecService#bindToRandomPort
Bug:
128024100
Test: 200x runs of testOpenAndCloseUdpEncapsulationSocket
Change-Id: I7e036ce821019dbac6c50899bd0894e89d2fe82a
chen xu [Thu, 28 Mar 2019 23:28:45 +0000 (16:28 -0700)]
scrub pii (imsi) from carrierIdentifier logging
Bug:
129229239
Test: Manual
Change-Id: I642d60e4ba1001bfd481aada87fa08dbd19098be
(cherry picked from commit
61b2c86719b0d599a2ecde8aeaa4369167e893cf)
Merged-in: I642d60e4ba1001bfd481aada87fa08dbd19098be
Sasha Smundak [Wed, 3 Apr 2019 18:42:07 +0000 (11:42 -0700)]
Convert core/tests/featureflagtests/Android.mk file to Android.bp
Cherrypick of https://googleplex-android-review.git.corp.google.com/c/platform/frameworks/base/+/
6924943
See build/soong/README.md for more information.
Bug:
122332340
Test: treehugger
Change-Id: If3f574bc15dedcd7880be605667297d257175c8d
Merged-In: If3f574bc15dedcd7880be605667297d257175c8d