OSDN Git Service
Remi NGUYEN VAN [Fri, 12 Apr 2019 01:18:12 +0000 (01:18 +0000)]
Merge "Change the validation URL for Chinese SIMs"
Luke Huang [Fri, 12 Apr 2019 00:45:18 +0000 (00:45 +0000)]
Merge "API council feedbacks for DnsResolver"
Nathan Harold [Fri, 12 Apr 2019 00:35:38 +0000 (00:35 +0000)]
Merge "Improve Range Checks on CellIdentity Classes"
Cody Kesting [Thu, 11 Apr 2019 22:11:12 +0000 (22:11 +0000)]
Merge "Update API for UiSelector."
Cody Kesting [Sat, 6 Apr 2019 16:39:59 +0000 (09:39 -0700)]
Update API for UiSelector.
Bug:
130371784
Test: API definition update. no impact to code.
Change-Id: I310b98426f0a8bc2e6c52f266ea669619a775552
Nathan Harold [Thu, 11 Apr 2019 00:39:27 +0000 (17:39 -0700)]
Improve Range Checks on CellIdentity Classes
Add range checks to ensure that parameters passed
to CellIdentity are within range; if not then set
them to the UNAVAILABLE value.
Bug:
122834811
Test: atest FrameworksTelephonyTests
Change-Id: I0d3699823be60722a1b741efd60b56f23bbc3e86
Rubin Xu [Thu, 11 Apr 2019 16:46:16 +0000 (16:46 +0000)]
Merge "Block incoming non-VPN packets to apps under fully-routed VPN"
Treehugger Robot [Thu, 11 Apr 2019 16:27:14 +0000 (16:27 +0000)]
Merge "Create new RcsParticipantQueryResultParcelable"
Luke Huang [Mon, 8 Apr 2019 07:16:04 +0000 (15:16 +0800)]
API council feedbacks for DnsResolver
To address the API review feedback provided by
the API council.
Bug:
129261432
Test: atest DnsResolverTest
Change-Id: I3de11c913682abf790850b45cd5d50ac28b3fc5c
Lorenzo Colitti [Thu, 11 Apr 2019 11:45:40 +0000 (11:45 +0000)]
Merge "Add support for TAP interfaces in TestNetworkManager."
Treehugger Robot [Thu, 11 Apr 2019 11:06:51 +0000 (11:06 +0000)]
Merge "provide a resource overlay to configure customized DNS Server."
Chiachang Wang [Thu, 11 Apr 2019 10:48:58 +0000 (10:48 +0000)]
Merge "Address nit in NetworkStackUtils"
Neil Fuller [Thu, 11 Apr 2019 09:27:54 +0000 (09:27 +0000)]
Merge "Switch from Byte.toHexString() to HexEncoding"
Neil Fuller [Thu, 4 Apr 2019 20:02:06 +0000 (21:02 +0100)]
Switch from Byte.toHexString() to HexEncoding
Switch from Byte.toHexString() to HexEncoding equivalents.
Bug:
124232146
Test: build only
Exempt-From-Owner-Approval: Cherry-picking OWNERS approved internal version
Merged-In: Id244e5247eb87c67446cbd65eb5d320f3617b8cd
Change-Id: Id244e5247eb87c67446cbd65eb5d320f3617b8cd
Remi NGUYEN VAN [Thu, 11 Apr 2019 06:36:06 +0000 (15:36 +0900)]
Change the validation URL for Chinese SIMs
The default HTTPS and fallback validation URLs are not accessible from
China, so users in China never get a validated network on WiFi with the
default AOSP settings. OEMs selling devices targeting China typically
change the check URLs for that reason.
When the device uses a Chinese SIM card, change the default validation
URLs to URLs accessible accessible from China as of now.
Test: inserted China SIM, WiFi off/on, dumpsys network_stack shows new
URL used
Bug:
111819230
Change-Id: Ib7f41f470ef1a9c7712f2477ebfab44e915cf1b9
Xiao Ma [Tue, 9 Apr 2019 10:16:17 +0000 (19:16 +0900)]
provide a resource overlay to configure customized DNS Server.
Bug:
122621524
Test: atest FrameworksNetTests NetworkStackTests
Change-Id: I123b3d4516cc6ba6d17629eb74daf448ba7121eb
Michele Berionne [Thu, 11 Apr 2019 06:27:08 +0000 (06:27 +0000)]
Merge "Remove @hide from builder of CarrierRestrictionRules"
Chiachang Wang [Thu, 11 Apr 2019 03:10:51 +0000 (11:10 +0800)]
Address nit in NetworkStackUtils
Follow up commit to fix nit in aosp/937891
Bug:
120013793
Test: Build
Change-Id: I61a6306d3c439a2d72323ab56e2b47771cc60d48
Remi NGUYEN VAN [Thu, 11 Apr 2019 00:13:29 +0000 (00:13 +0000)]
Merge "Freeze netd AIDL interface (framework)"
Treehugger Robot [Thu, 11 Apr 2019 00:10:34 +0000 (00:10 +0000)]
Merge "Disable XOM on libraries for apps with targetSdkVerison<Q"
Michele [Wed, 10 Apr 2019 21:29:00 +0000 (14:29 -0700)]
Remove @hide from builder of CarrierRestrictionRules
Remove @hide from builder of CarrierRestrictionRules class.
Bug:
124325937
Test: compilation
Change-Id: If05e7d950b6737a6bb92af962816c7cbc36b00d1
Jack Yu [Wed, 10 Apr 2019 22:22:11 +0000 (22:22 +0000)]
Merge "Allow GSM RSSI levels to be customized by CarrierConfig"
David Brazdil [Wed, 10 Apr 2019 22:18:02 +0000 (22:18 +0000)]
Merge "Update AppComponentFactory.instantiateClassLoader docs"
Jeff Vander Stoep [Tue, 26 Mar 2019 03:27:52 +0000 (20:27 -0700)]
Disable XOM on libraries for apps with targetSdkVerison<Q
Apps may (and do) assume that libraries are readable. To avoid app
breakage, mark execute-only sections of as read+execute
for apps with targetSdkVersion<Q.
Bug:
128907672
Test: Check libc for app with targetSdk==current
cat /proc/25950/maps | grep libc.so
77c01e3000-
77c028b000 --xp
00041000 07:20 106 /apex/com.android.runtime/lib64/bionic/libc.so
Test: Check libc for app with targetSdk<current
cat /proc/26355/maps | grep libc.so
77c01e3000-
77c028b000 r-xp
00041000 07:20 106
/apex/com.android.runtime/lib64/bionic/libc.so
Change-Id: I90b5c91923c8008ae4b4818985842fe3e354a850
Merged-In: I90b5c91923c8008ae4b4818985842fe3e354a850
(cherry picked from commit
739c0b5193345abfce0373502c795448cc94a3ab)
David Brazdil [Tue, 9 Apr 2019 16:18:31 +0000 (17:18 +0100)]
Update AppComponentFactory.instantiateClassLoader docs
Clarify the intended use and properties of the default class loader.
Bug:
128524313
Test: n/a
Change-Id: Iae82554f9294d5248b98f1fa72fc1a47993e86fd
Nathan Harold [Wed, 10 Apr 2019 17:29:01 +0000 (17:29 +0000)]
Merge "Update Javadocs for CellInfo Classes"
Benedict Wong [Wed, 10 Apr 2019 17:06:17 +0000 (17:06 +0000)]
Merge changes I98573a5c,Ic7394f24
* changes:
Enable checks for MANAGE_TEST_NETWORKS in TestNetworkService
Cleanup of Test Network service
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
Cody Kesting [Wed, 10 Apr 2019 15:15:14 +0000 (15:15 +0000)]
Merge "Update TelMan API for testing Line1NumberForDisplay."
Treehugger Robot [Wed, 10 Apr 2019 11:38:24 +0000 (11:38 +0000)]
Merge "Add missing @Deprecated annotation."
Tobias Thierer [Wed, 10 Apr 2019 09:32:04 +0000 (10:32 +0100)]
Add missing @Deprecated annotation.
make warns when a @deprecated javadoc tag is not matched by
a corresponding annotation. The other @deprecated fields in
this class have both.
Fixes:
71706673
Test: Treehugger
Change-Id: I3749a54acc9f63dabdacac77849add34d4085561
Lorenzo Colitti [Wed, 10 Apr 2019 09:30:03 +0000 (09:30 +0000)]
Merge "Add lifecycle tests to NetworkMonitorTest"
Narayan Kamath [Wed, 10 Apr 2019 07:57:27 +0000 (07:57 +0000)]
Merge "Shell: Grant CACHE_CONTENT to Shell"
Treehugger Robot [Wed, 10 Apr 2019 06:30:55 +0000 (06:30 +0000)]
Merge "Fix comment on StaticIpConfiguration#getDomains"
Treehugger Robot [Wed, 10 Apr 2019 06:30:26 +0000 (06:30 +0000)]
Merge "Add smoke test for jni library"
Lorenzo Colitti [Mon, 1 Apr 2019 14:41:12 +0000 (23:41 +0900)]
Add support for TAP interfaces in TestNetworkManager.
Test: builds, boots
Change-Id: I88bfd7f37c0ba0228f8288fe92212618ce134e4f
Benedict Wong [Tue, 9 Apr 2019 23:29:43 +0000 (16:29 -0700)]
Enable checks for MANAGE_TEST_NETWORKS in TestNetworkService
This commit re-enables enforcement of the MANAGE_TEST_NETWORK
permission, which is only granted to the shell. CTS tests using this
permission should use UiAutomation.adoptShellPermissionIdentity() to
gain access.
Bug:
72950854
Test: IPsec CTS tests using this passing
Change-Id: I98573a5c68e45abbbaddef01f6ac74a6a18e26f9
Chiachang Wang [Wed, 10 Apr 2019 03:27:19 +0000 (03:27 +0000)]
Merge "Move data stall definitions out from Setting"
Chiachang Wang [Mon, 8 Apr 2019 11:06:21 +0000 (19:06 +0800)]
Move data stall definitions out from Setting
From mainline perspective, we should use android flag api
instead of using Settings. Thus, move the definitions into
NetworkStack.
Bug:
120013793
Test: atest NetworkStackTests SettingsBackupTest
Change-Id: I8e1fb5b47fff3bf624131ba1f5732daabd991e6d
Merged-In: I8e1fb5b47fff3bf624131ba1f5732daabd991e6d
Merged-In: I0a2a1e5d3de14ea86556ca471e26064df3481412
Chiachang Wang [Wed, 10 Apr 2019 02:27:30 +0000 (02:27 +0000)]
Merge "Enforce NETWORK_STACK permission for calling NSS#forceUpdateIfaces"
Remi NGUYEN VAN [Tue, 9 Apr 2019 05:01:51 +0000 (14:01 +0900)]
Freeze netd AIDL interface (framework)
This freezes the interface as of the latest beta build, although it has
not changed since then.
This change adds the necessary implementations for getInterfaceVersion.
Test: flashed, WiFi working
Bug:
128803828
Change-Id: I43a6a38685d5fbc669cd573c4d7e7f99bd596952
Remi NGUYEN VAN [Wed, 10 Apr 2019 01:41:20 +0000 (01:41 +0000)]
Merge "Crash the system server if network stack is lost"
Kiyoung Kim [Wed, 10 Apr 2019 00:34:54 +0000 (00:34 +0000)]
Merge "Check if product app is unbundled from property."
Amit Mahajan [Wed, 10 Apr 2019 00:08:43 +0000 (00:08 +0000)]
Merge "Make sure APN type ALL does not include types that are not wild cardable"
Benedict Wong [Wed, 13 Mar 2019 04:54:16 +0000 (21:54 -0700)]
Cleanup of Test Network service
This follow-up change performs some cleanup changes without affecting
functionality
Bug:
72950854
Test: Compiles, CTS tests using this pass
Change-Id: Ic7394f24f11d713c9374b438182e29d2a02ea236
Amit Mahajan [Mon, 8 Apr 2019 21:07:45 +0000 (14:07 -0700)]
Make sure APN type ALL does not include types that are not wild cardable
Test: manual, atest FrameworksTelephonyTests:ApnSettingTest
Bug:
130167974
Merged-in: Ia029df91781ee125078a2b4cc4d0364919c95fd6
Change-Id: Ia029df91781ee125078a2b4cc4d0364919c95fd6
(cherry picked from commit
72ea0fd5a757ec128271f127c1af6f1627627216)
Chenbo Feng [Fri, 5 Apr 2019 21:14:55 +0000 (14:14 -0700)]
Add smoke test for jni library
Since the Framework net test require jni library
libnetworkstatsfactorytestjni, but the test fails to load that library
unless *all* the dependencies of that library are explicitly listed in
jni_libs, whenever any of the dependencies changes the framework net
test will start failing and it might not be catched since the change
might not related to frameworks/base. And this smoke test is aimed to
spot those native library changes and it should be stable enough to put
in global presubmit.
Bug:
124764595
Test: FrameworksNetSmokeTests
Change-Id: Id24e7f0558b5643e4ad7393e85f1f0a2bd875615
Leland Miller [Fri, 22 Mar 2019 21:20:14 +0000 (14:20 -0700)]
Create new RcsParticipantQueryResultParcelable
This parcelable class now backes RcsParticipantQueryResult. This change
will allow injection of API layer dependencies into
RcsParticipantQueryResult.
Change-Id: I6d002d1e9b61831169eee66f76fed743beffc446
Test: Existing tests pass
Bug:
123699565
Nathan Harold [Tue, 9 Apr 2019 02:21:02 +0000 (19:21 -0700)]
Update Javadocs for CellInfo Classes
-Add nullability annotations for getMccString
and getMncString.
-Add IntRange to CellSignalStrength#getLevel()
-Fix a few docstring errors.
Bug:
129902021
Test: make && make update-api && make offline-sdk-docs
(no functional change)
Merged-In: I61d645f79a23226ab902fc657fe7b07ffd674a0b
Change-Id: I61d645f79a23226ab902fc657fe7b07ffd674a0b
Narayan Kamath [Mon, 8 Apr 2019 16:32:33 +0000 (17:32 +0100)]
Shell: Grant CACHE_CONTENT to Shell
Required to test ContentResover#[get|put]Cache
Bug:
127711435
Test: atest CtsContentTestCases
(cherry picked from commit
a31ed1bbdd45625036ac65bb41d2f1d462e14a04)
Merged-In: I5eb72772a0a35897611dd6db95c68a2d2e971e9a
Change-Id: I91a91a2969db175d88e9f41938869bc751f7b108
andychou [Tue, 9 Apr 2019 06:50:31 +0000 (14:50 +0800)]
Allow GSM RSSI levels to be customized by CarrierConfig
Add carrier config gsm_rssi_thresholds_int_array and mapping level
according to config
BUG:
123528673
Test: build pass and override carrierconfig to test
Merged-In: I61afd1f07564c0df886b0e30d27ea2a059b484dc
Change-Id: I61afd1f07564c0df886b0e30d27ea2a059b484dc
(cherry picked from commit
b80dbce9a3b907bd5cc81984fe4f472833c030f1)
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"
Lorenzo Colitti [Mon, 8 Apr 2019 12:51:41 +0000 (21:51 +0900)]
Add lifecycle tests to NetworkMonitorTest
- Ensure that NetworkMonitor quits when notifyNetworkDisconnected
is called.
- Ensure that BroadcastReceivers are registered when a captive
portal is detected and unregistered when the network validates
or when NetworkMonitor quits.
Bug:
122164725
Test: atest FrameworksNetTests NetworkStackTests
Test: atest --generate-new-metrics 10 NetworkStackTests:com.android.server.connectivity.NetworkMonitorTest
Test: test fails if "Don't leak captive portal broadcast receivers." change reverted
Change-Id: I1202626face33cc1e1ec02016b95da487b3335c8
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"
Chiachang Wang [Tue, 9 Apr 2019 11:42:52 +0000 (19:42 +0800)]
Enforce NETWORK_STACK permission for calling NSS#forceUpdateIfaces
ConnectivityManager and its usages are removed from
NetworkStatsService. After that, forceUpdateIfaces requires
information that only ConnectivityService has, hence
restricting the calling permission to NETWORK_STACK or
MAINLINE_NETWORK_STACK permission. The required permission
will be changed from READ_NETWORK_USAGE_HISTORY to
NETWORK_STACK or MAINLINE_NETWORK_STACK. This change would make
it impossible to call outside the system.
Bug:
126830974
Test: atest FrameworksNetTests
Change-Id: I776484921b2dbb6735d7940c558fb5e4baed6d1e
Neil Fuller [Tue, 9 Apr 2019 09:50:59 +0000 (09:50 +0000)]
Merge "Switch to HexEncoding from ByteStringUtils"
Remi NGUYEN VAN [Tue, 19 Feb 2019 03:54:04 +0000 (12:54 +0900)]
Crash the system server if network stack is lost
Crash the system server if it cannot bind to the network stack, or if
the network stack crashes. This is better than keeping the system
running in a bad state where all networking would be broken.
Before the network stack was moved to a different process, the whole
system would go down when it encountered a crash.
Test: added crash in NetworkStack, verified system_server restart
Bug:
130028724
Change-Id: Ia8ee7699c4b15ba4b1116c7ba9171bf6034b52c3
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
Cody Kesting [Thu, 4 Apr 2019 23:56:34 +0000 (16:56 -0700)]
Update TelMan API for testing Line1NumberForDisplay.
CTS testing is being added for
TelephonyManager#setLine1NumberForDisplay. This requires making the
getter for alphaTag visible for testing with the @TestApi annotation.
Bug:
31963371
Test: API change. tests are unaffected.
Change-Id: I85887cf05f395f4ac4ca8dc6800e29f4fc9f8de4
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"