Commit Graph

382413 Commits

Author SHA1 Message Date
Treehugger Robot
b0b166054d Merge "Add smoke test for jni library" 2019-04-10 06:30:26 +00:00
Chiachang Wang
e9a39ceb6b Merge "Move data stall definitions out from Setting" 2019-04-10 03:27:19 +00:00
Chiachang Wang
2449e583d8 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
2019-04-10 02:37:57 +00:00
Chiachang Wang
c72f456b19 Merge "Enforce NETWORK_STACK permission for calling NSS#forceUpdateIfaces" 2019-04-10 02:27:30 +00:00
Remi NGUYEN VAN
825181be4c Merge "Crash the system server if network stack is lost" 2019-04-10 01:41:20 +00:00
Kiyoung Kim
2ed229287d Merge "Check if product app is unbundled from property." 2019-04-10 00:34:54 +00:00
Amit Mahajan
0d4f48f49d Merge "Make sure APN type ALL does not include types that are not wild cardable" 2019-04-10 00:08:43 +00:00
Amit Mahajan
999f2f5e38 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 72ea0fd5a7)
2019-04-09 14:57:41 -07:00
Chenbo Feng
5f8a630da7 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
2019-04-09 14:45:35 -07:00
Neil Fuller
46a93ae8f8 Merge "Switch to HexEncoding from ByteStringUtils" 2019-04-09 17:45:29 +00:00
Shuo Qian
211771cf79 Merge "Use Received Uri as Gateway Uri" 2019-04-09 17:29:19 +00:00
Benedict Wong
3102fa42a7 Merge "Fix remove-before-add for IpSecService RefcountedResource" 2019-04-09 17:22:56 +00:00
Treehugger Robot
ad2928ac86 Merge "Create new RcsThreadQueryResultParcelable" 2019-04-09 16:29:13 +00:00
vichang
3183cbf6dc Merge "Remove the feature flag for time zone picker" 2019-04-09 12:23:19 +00:00
Junyu Lai
289b565dba Merge "Fix onBlockedStatusChanged does not work on multiple networks" 2019-04-09 12:13:26 +00:00
Chalard Jean
fb08776087 Merge "Move the latest AIDL update to the bottom" 2019-04-09 12:06:03 +00:00
Chiachang Wang
e05d9d88bd 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
2019-04-09 19:42:52 +08:00
Neil Fuller
70f7a0bf04 Merge "Switch to HexEncoding from ByteStringUtils" 2019-04-09 09:50:59 +00:00
Remi NGUYEN VAN
06f39168df 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
2019-04-09 18:17:45 +09:00
Neil Fuller
62af80f9c8 Switch to HexEncoding from ByteStringUtils
Migration in preparation for deletion of ByteStringUtils.

Bug: 124232146
Test: build only
Merged-In: I07983ca596443a3e00616b63355c6504376f3e7c
Change-Id: I07983ca596443a3e00616b63355c6504376f3e7c
2019-04-09 09:09:35 +01:00
Treehugger Robot
e467620566 Merge "ActivityManager: process stop needs a process to stop" 2019-04-09 06:50:43 +00:00
Chalard Jean
8781aa3fbe Merge "Address leftover comments on aosp/894233" 2019-04-09 05:51:18 +00:00
Treehugger Robot
fe3ebab0b3 Merge "Mainline logging to statsd: native static libs" 2019-04-09 05:42:12 +00:00
Remi NGUYEN VAN
7bb487a582 Merge "Expose captive portal urls for configuration" 2019-04-09 04:37:48 +00:00
Xin Li
a4431ffb7a Merge "DO NOT MERGE -- Merge PPRL.190405.003 into master" 2019-04-09 04:29:22 +00:00
Chalard Jean
415f523f7c Address leftover comments on aosp/894233
Bug: 129510344
Test: m, boots, wifi connects, resolves DNS
Change-Id: Idf24f42a86bbfcc89e3ea8cf50d1b705d72ac613
2019-04-09 12:03:28 +09:00
Lorenzo Colitti
873badbd1c Merge "Don't leak captive portal broadcast receivers." 2019-04-09 02:45:42 +00:00
Xin Li
1eaefb3010 DO NOT MERGE -- Merge PPRL.190405.003 into master
Bug: 130175407
Change-Id: I0f7d294680477f7ee8b25d2b8622f3ff05bc4f41
2019-04-08 18:56:15 -07:00
Benedict Wong
ccfaa3c06d 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
2019-04-08 18:51:50 -07:00
Treehugger Robot
130b5bf146 Merge "Removed log spam from the Zygote." 2019-04-09 01:35:15 +00:00
Niklas Lindgren
afc5f9bd3d 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
2019-04-09 10:23:53 +09:00
sqian
5f78486ac1 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
2019-04-08 17:55:17 -07:00
Leland Miller
89a9bfe4c0 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
2019-04-08 16:53:39 -07:00
Chris Wailes
da0a9cd05c 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
2019-04-08 15:52:40 -07:00
Nathan Harold
891f195a23 Merge changes from topic "tdscdma-rscp"
* changes:
  Fix getLevel for CellSignalStrengthTdscdma
  Rename LevelCalculationMethod Constant
2019-04-08 22:42:35 +00:00
Xiangyu/Malcolm Chen
9f80ec1d51 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.
2019-04-08 22:29:36 +00:00
Jack Yu
5f8b1bfe66 Merge "Fixed incorrect service state populated" 2019-04-08 21:19:54 +00:00
Neil Fuller
b39d83ebf0 Switch to HexEncoding from ByteStringUtils
Migration in preparation for deletion of ByteStringUtils.

Bug: 124232146
Test: build only
Change-Id: I9f18bb56eccf5bd628e1fd9068285f75623f7caf
2019-04-08 21:57:53 +01:00
Malcolm Chen
d262f4c14b Changing default phone capability.
Bug: 126864501
Test: manual
Change-Id: I3d50fb30980b5e2d2240bd186fb15c7f2a7c21ab
Merged-In: I3d50fb30980b5e2d2240bd186fb15c7f2a7c21ab
2019-04-08 13:24:36 -07:00
Malcolm Chen
9ee1473191 Remove hidden IntDef in java doc.
Bug: 128456336
Test: build
Change-Id: If016aabda5092d299eca2e858f26057614767297
Merged-In: If016aabda5092d299eca2e858f26057614767297
2019-04-08 12:58:05 -07:00
Malcolm Chen
96dd9e4dfe Add @hide API to return whether a modem stack is enabled or not.
Bug: 129296702
Test: TelephonyManagerTestApp
Change-Id: I7ef4ad8322cf85e5a159363e90dde303ac7240de
Merged-In: I7ef4ad8322cf85e5a159363e90dde303ac7240de
2019-04-08 12:53:50 -07:00
android-build-team Robot
a104dea550 Snap for 5310204 from 1b1681a8b0 to pi-platform-release
Change-Id: Id8efd34958658db735305602cdace27a8a73394a
2019-04-08 18:00:14 +00:00
Treehugger Robot
820a7b5144 Merge "Fix documentation of CallRedirectionService" 2019-04-08 17:35:24 +00:00
Jack Yu
9443c8e966 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 9302618da6)
2019-04-08 09:45:33 -07:00
Lorenzo Colitti
e35374386b 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
2019-04-08 21:14:23 +09:00
Treehugger Robot
3729b26f8a Merge "Add FrameworksNetTests dependency on libcgrouprc" 2019-04-08 10:19:26 +00:00
Orion Hodson
4e6a314e73 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
2019-04-08 10:50:10 +01:00
junyulai
26b7664c43 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
2019-04-08 17:15:52 +08:00
Remi NGUYEN VAN
94dc6d68e9 Add FrameworksNetTests dependency on libcgrouprc
The tests are currently broken without this dependency.

Bug: 129902619
Test: atest FrameworksNetTests
Merged-In: Ifcfe4df81caf8ede2e4e66a76552cb3200378fa8
Change-Id: I85891485157ed86e069039dfe3092028ff703dd5
2019-04-08 17:34:47 +09:00
Treehugger Robot
43b75cad9e Merge "Fix exception of unregisterCallback when callback is not registered" 2019-04-08 05:00:25 +00:00