OSDN Git Service
Remi NGUYEN VAN [Sat, 16 Feb 2019 01:48:49 +0000 (01:48 +0000)]
Merge "Sign networkstack with its own certificate"
Remi NGUYEN VAN [Sat, 16 Feb 2019 00:22:29 +0000 (00:22 +0000)]
Merge "Fix framework and NetworkStack classes conflicts"
Elliott Hughes [Sat, 16 Feb 2019 00:12:51 +0000 (00:12 +0000)]
Merge "zygote: use async signal safe log to record child process death"
Dichen Zhang [Fri, 15 Feb 2019 21:47:26 +0000 (21:47 +0000)]
Merge "HLS seeking: call readAt() on new thread"
Shuo Qian [Fri, 15 Feb 2019 21:23:52 +0000 (21:23 +0000)]
Merge "Populate 'hasKnownUserIntentEmergency'"
Treehugger Robot [Fri, 15 Feb 2019 21:12:29 +0000 (21:12 +0000)]
Merge "Adding framework check for 3DES key size"
Jeff Sharkey [Fri, 15 Feb 2019 18:34:31 +0000 (18:34 +0000)]
Merge "No-op flag to keep tests working in this branch."
Leland Miller [Fri, 15 Feb 2019 18:16:12 +0000 (18:16 +0000)]
Merge "Move RCS table creation flag to contract class"
Todd Kennedy [Fri, 15 Feb 2019 18:10:49 +0000 (18:10 +0000)]
Merge "Add new file to owners"
Christian Wailes [Fri, 15 Feb 2019 18:09:03 +0000 (18:09 +0000)]
Merge "Fix loop iteration bug."
Jeff Sharkey [Fri, 15 Feb 2019 16:49:15 +0000 (09:49 -0700)]
No-op flag to keep tests working in this branch.
Bug:
124507818
Test: manual
Change-Id: I65ae1a55c420690e68f833674d4d09452a826302
Merged-In: I7973b123cf4fc08e8ce2b05bd4c23fa41b1cdcdf
Todd Kennedy [Fri, 15 Feb 2019 12:55:32 +0000 (04:55 -0800)]
Add new file to owners
Test: None
Change-Id: I69f415929785845ede8f2d1341f4b70f97b4f480
Treehugger Robot [Fri, 15 Feb 2019 11:33:27 +0000 (11:33 +0000)]
Merge "Update VPN capabilities when its underlying network set is null."
Remi NGUYEN VAN [Fri, 15 Feb 2019 10:52:03 +0000 (10:52 +0000)]
Merge "Move NetworkStack to services.net"
Remi NGUYEN VAN [Fri, 15 Feb 2019 08:45:03 +0000 (17:45 +0900)]
Sign networkstack with its own certificate
The NetworkStack module is comprised of 2 updatable APKs
(NetworkStack.apk and CaptivePortalLogin.apk), and a stub APK to define
the signature permissions for the APKs (NetworkStackPermissionStub.apk).
Test: flashed, WiFi works, captive portal login works
Bug:
124033493
Change-Id: I772d1d63363a3eb6f817c21906498bd2385ab02b
Remi NGUYEN VAN [Thu, 14 Feb 2019 09:19:14 +0000 (18:19 +0900)]
Fix framework and NetworkStack classes conflicts
Classes that are used in framework.jar cannot be linked in NetworkStack,
as the framework takes precedence in the classpath. This prevents the
networkstack from using these classes due to the hidden API usage
detection.
Do the following:
- jarjar any shared source file between framework and NetworkStack, so
the version in the NetworkStack uses a different package.
- Move any shared class not used in the NetworkStack to services.net
The CL uses jarjar on the app copy and not the framework classes, as
the framework cannot be updated without an OTA, and non-network stack
specific classes should not be renamed because of the network stack.
Test: atest FrameworksNetTests NetworkStackTests
Test: flashed svelte build, WiFi works
Bug:
124033493
Change-Id: I85d888b756adc28c36638913632bfdfdbf0e0486
Remi NGUYEN VAN [Fri, 15 Feb 2019 08:16:03 +0000 (08:16 +0000)]
Merge "Add NetworkStackTests to device-tests suite"
Remi NGUYEN VAN [Fri, 15 Feb 2019 08:09:29 +0000 (08:09 +0000)]
Merge "Remove NetworkMonitor dependency on ICaptivePortal"
Xiao Ma [Fri, 15 Feb 2019 04:04:32 +0000 (04:04 +0000)]
Merge "Fix testApfFilterKeepaliveAck."
Dan Shi [Thu, 14 Feb 2019 19:42:02 +0000 (11:42 -0800)]
Add NetworkStackTests to device-tests suite
It's needed for the test to run in a Test Mapping suite.
Bug:
123544631
Test: local build
Change-Id: I0678a3e8f9beed7c637c1b11594369aa5d3c87bf
Remi NGUYEN VAN [Thu, 14 Feb 2019 09:04:20 +0000 (18:04 +0900)]
Move NetworkStack to services.net
NetworkStack is only used in services.net or clients of services.net. It
cannot stay in framework.jar because it needs to depend on AIDL
interfaces, which would conflict with app implementations if they were
in framework.jar.
Test: atest FrameworksNetTests NetworkStackTests
Bug:
124033493
Change-Id: Ib1d08a3669983640119d008db7e2990fa798724f
Merged-In: I501b125a388c1100c2182bde4670944c2f0d7a02
Remi NGUYEN VAN [Wed, 13 Feb 2019 11:58:59 +0000 (20:58 +0900)]
Remove NetworkMonitor dependency on ICaptivePortal
ICaptivePortal is used in the framework and cannot be used as a
dependency in NetworkMonitor, as the framework class takes precedence
when linking.
Also fix NetworkMonitorTest that was not verifying the right
startCaptivePortalApp call.
Test: atest FrameworksNetTests NetworkStackTests
Bug:
124033493
Change-Id: I8e7bb79e50650ae182a2e4277fb49abf5fb6d910
Merged-In: Ib6a89e54312628662b130fbeec18d11e139f09fa
Remi NGUYEN VAN [Fri, 15 Feb 2019 03:11:31 +0000 (03:11 +0000)]
Merge "Remove deps from framework on netd interfaces"
Varun Anand [Wed, 6 Feb 2019 18:13:38 +0000 (10:13 -0800)]
Update VPN capabilities when its underlying network set is null.
Previously, they were only updated when underlying network set was
non-null.
This change also ensures that all the calls b/w ConnectivityService and
Vpn that leads to updating capabilities are on ConnectivityService
handler thread.
Additionally, it also ensures that capabilities are propagated after VPN
enters connected state. This was previously done from establish which
could potentially lead to race between VPN getting connected and
capabilities getting updated.
This change also updates VPN capabilities inline from
ConnectivityService handler thread. Previously, there was an additional
loop where Vpn would update capabilities via NetworkAgent thru
AsyncChannel which posts back to CS handler thread, which could
potentially lead to delays in updating VPN capabilities.
Bug:
119129310
Bug:
118856062
Bug:
124268198
Test: atest FrameworksNetTests
Test: manual - verified VPNs capabilities are getting updated and
DownloadManager is working correctly.
Change-Id: Id0abc4d304bb096e92479a118168690ccce634ed
Eric Laurent [Fri, 15 Feb 2019 00:43:31 +0000 (00:43 +0000)]
Merge "Prevent 3rd party app from turning on speaker during the system call Test: manual"
Dichen Zhang [Tue, 29 Jan 2019 22:47:36 +0000 (14:47 -0800)]
HLS seeking: call readAt() on new thread
Bug:
119900000
Test: go/ag/
5140159
Change-Id: Ie527aeaff91e1b82c7e707a6feaf79548c7ac380
Brad Ebinger [Thu, 14 Feb 2019 23:40:44 +0000 (23:40 +0000)]
Merge "SMS: Add a compatible API getRecipientAddress for 3GPP2 SMS"
Treehugger Robot [Thu, 14 Feb 2019 21:50:08 +0000 (21:50 +0000)]
Merge "Fixed a typo in an OWNERS file."
Chris Wailes [Thu, 14 Feb 2019 19:20:02 +0000 (11:20 -0800)]
Fix loop iteration bug.
This patch fixes a loop iteration bug in the capabilities calculation
code of the Zygote. This bug was introduced in aosp/804219.
Bug:
124268515
Test: Built
Change-Id: Ic4e3e736c0aa0e2ecaed87ca6f12367be41715f3
Benedict Wong [Thu, 14 Feb 2019 18:37:04 +0000 (18:37 +0000)]
Merge "Add Test Network and Transport types"
Treehugger Robot [Thu, 14 Feb 2019 12:24:32 +0000 (12:24 +0000)]
Merge "Add :frameworks-base-api-current.txt filegroup"
Xiao Ma [Sun, 10 Feb 2019 05:52:37 +0000 (14:52 +0900)]
Fix testApfFilterKeepaliveAck.
Apf program for TCP keep alive ACK also compares protocol field in IPv4
header and the total length of TCP keep alive ACK packet. Besides,
should set the ACK flag in the the TCP header of keep alive ACK packet.
Bug:
123992564
Test: atest NetworkStackTests
Change-Id: I997cd6807a33f7e1af25566226d803dcc2e257dd
Remi NGUYEN VAN [Wed, 13 Feb 2019 09:28:35 +0000 (18:28 +0900)]
Remove deps from framework on netd interfaces
If included in framework.jar, the interfaces conflict with any app that
needs to depend on them, including the NetworkStack.
Bug:
124033493
Test: atest FrameworksNetTests NetworkStackTests
Change-Id: I2db9f87b7154130726d4700b241d55b041635d98
Merged-In: I0ecae20d514bf888f3a80331f19369ceb1c52aa3
Chiachang Wang [Thu, 14 Feb 2019 07:24:16 +0000 (07:24 +0000)]
Merge "Use ServiceState to get data cell ID"
Colin Cross [Thu, 14 Feb 2019 04:58:42 +0000 (04:58 +0000)]
Merge "Don't run doc-comment-check-docs for update-api"
Treehugger Robot [Thu, 14 Feb 2019 04:55:21 +0000 (04:55 +0000)]
Merge "Add "close" socket option for immediately close socket after finish check captive portal."
sqian [Sat, 9 Feb 2019 05:42:15 +0000 (21:42 -0800)]
Populate 'hasKnownUserIntentEmergency'
This is only used to specify when the dialed number is ambiguous,
identified as both emergency number and any other non-emergency number;
e.g. in some situation, 611 could be both an emergency number in a
country and a non-emergency number of a carrier's customer service hotline.
Test: Manual
Bug:
123999640
Change-Id: I7b1a8832ab86b3e7d8f9af24eb4f7bde7d566612
Merged-In: I7b1a8832ab86b3e7d8f9af24eb4f7bde7d566612
(cherry picked from commit
6d9e7457dadaf683b2706ba1a41bd8385f25c9a2)
Remi NGUYEN VAN [Thu, 14 Feb 2019 03:29:00 +0000 (03:29 +0000)]
Merge "Fix flaky testNattSocketKeepalives"
Remi NGUYEN VAN [Fri, 8 Feb 2019 08:10:50 +0000 (17:10 +0900)]
Fix flaky testNattSocketKeepalives
The test did not wait for the WifiNetworkAgent to disconnect, and there
are reports of flakes where it is still connected in
connectKeepaliveNetwork.
Test: atest FrameworksNetTests
Bug:
124319553
Change-Id: I85968806885c8853ec4f4dbea356366c1af0ea1c
Shuo Qian [Thu, 14 Feb 2019 02:59:09 +0000 (02:59 +0000)]
Merge "Call e.rethrowFromSystemServer() to exception of setDefaultSmsSubId"
Chiachang Wang [Thu, 14 Feb 2019 02:57:38 +0000 (02:57 +0000)]
Merge "Add build rule of data stall proto"
Chiachang Wang [Thu, 14 Feb 2019 02:55:03 +0000 (10:55 +0800)]
Add build rule of data stall proto
Bug:
121185319
Bug:
120452078
Test: Build and test against data stall code
Change-Id: I3b243ab947464a431ef205c5f2f30edc883e2963
Hongshik [Fri, 11 Jan 2019 18:09:34 +0000 (03:09 +0900)]
Add "close" socket option for immediately close socket after finish check captive portal.
Unexpected packets are observed after captive portal check. Due to the packets, modem can't fall-back to idle state (modem remained as active state).
It makes unnecessary power consumtion.
To prevent it, "close" option is added in sendHttpProbe()
Test: check socket close.
Change-Id: I5b6987071ad915081846504adbb209eb371fd1c3
Lucas Lin [Thu, 14 Feb 2019 01:40:47 +0000 (01:40 +0000)]
Merge "Clear all lingering notifications when network is disconnected"
Chiachang Wang [Thu, 14 Feb 2019 01:30:58 +0000 (09:30 +0800)]
Use ServiceState to get data cell ID
ServiceState now contains a CellIdentity that can be obtained
specifically from the data subscription, and for PS on cell
only.
This should be used for connectivity level network monitoring
info.
Bug:
123893112
Test: 1. atest NetworkMonitorTest
2. Verify if cell id is correct
Change-Id: Ieb00de84a0d518e3197e3884f946b872e998304a
Colin Cross [Thu, 14 Feb 2019 01:22:47 +0000 (17:22 -0800)]
Don't run doc-comment-check-docs for update-api
update-api would be fast except that it spends ~4 minutes doing
doc-comment-check-docs. doc-comment-check-docs isn't really
related to update-api, so lets just remove it.
Fixes:
124386818
Test: m update-api
Change-Id: I0f5311e98063786671c0d8b6a8db52351d9fcfd7
Treehugger Robot [Thu, 14 Feb 2019 01:19:50 +0000 (01:19 +0000)]
Merge "Enable DOM storage API for CaptivePortalLoginActivity"
sqian [Wed, 13 Feb 2019 22:41:44 +0000 (14:41 -0800)]
Call e.rethrowFromSystemServer() to exception of setDefaultSmsSubId
Test: Treehugger
Bug:
123927534
Change-Id: Ica15965cb904b758e078b8439e5e9d3f39b9c0a2
Merged-In: Ica15965cb904b758e078b8439e5e9d3f39b9c0a2
(cherry picked from commit
04e94fcb0a41a50dce82f20a603b71614c3f5ed0)
Jordan Liu [Thu, 14 Feb 2019 00:14:11 +0000 (00:14 +0000)]
Merge "Add UNINITIALIZED and rename INVALID"
Hall Liu [Wed, 13 Feb 2019 23:21:43 +0000 (23:21 +0000)]
Merge "Implement more location checks"
Max Bires [Wed, 13 Feb 2019 23:08:13 +0000 (15:08 -0800)]
Adding framework check for 3DES key size
Previously the framework would accept any key size that was a multiple
of 8 for the KeyGenerator.
Bug:
117509689
Bug:
122274787
Test: atest cts/tests/tests/keystore/src/android/keystore/cts/KeyGeneratorTest.java
Change-Id: I60b52f6062a41ae52486bae0ae36616f4b532b37
Treehugger Robot [Wed, 13 Feb 2019 22:26:10 +0000 (22:26 +0000)]
Pengquan Meng [Wed, 13 Feb 2019 22:23:16 +0000 (22:23 +0000)]
Merge "Add getSlotsMapping to TelephonyManager"
wangmingming1 [Wed, 14 Nov 2018 02:43:36 +0000 (10:43 +0800)]
zygote: use async signal safe log to record child process death
Bug: https://issuetracker.google.com/issues/
119713191
Test: open/close apps, observe the child process death log
Test: run monkey
Change-Id: Ia121f44c00f715367446dfe97de6df1f7fa6bdfe
Signed-off-by: wangmingming1 <wangmingming1@xiaomi.com>
Hui Yu [Wed, 13 Feb 2019 20:29:38 +0000 (12:29 -0800)]
Manually merge
885aca1bbaa076b11914b9e4cb0d2a6d0c6fab3a to aosp-master
Bug: None.
Test: NA.
Change-Id: I04ebbaa3c2f939b139f0b8b6f25777383fd42375
Merged-In: Ifcc0c80f1da45c2ff89f7c88da6407ba777473e2
Hui Yu [Wed, 13 Feb 2019 20:23:03 +0000 (20:23 +0000)]
Merge "Revert "RESTRICT AUTOMERGE: Manually merge
885aca1bbaa076b11914b9e4cb0d2a6d0c6fab3a to aosp-master""
Chris Wailes [Wed, 13 Feb 2019 20:21:28 +0000 (12:21 -0800)]
Fixed a typo in an OWNERS file.
Test: None
Change-Id: I7f758f20fb2e5bfb9c2ba3193e55080046902bdc
Hui Yu [Wed, 13 Feb 2019 20:10:27 +0000 (20:10 +0000)]
Revert "RESTRICT AUTOMERGE: Manually merge
885aca1bbaa076b11914b9e4cb0d2a6d0c6fab3a to aosp-master"
This reverts commit
a738111eeea622a25cb50ed7bcae5cbf0218b137.
Reason for revert: mistakenly used "RESTRICT AUTOMERGE" on the title.
Change-Id: I7ec9917887763912114405ba89eb5f0fac328d97
Jordan Liu [Wed, 13 Feb 2019 19:26:58 +0000 (19:26 +0000)]
Merge "Update documentation for SubscriptionManager listener"
Tianjie Xu [Wed, 13 Feb 2019 19:18:01 +0000 (19:18 +0000)]
Merge "Improved wipe reason information for RecoverySystem"
Hall Liu [Tue, 27 Nov 2018 22:36:51 +0000 (14:36 -0800)]
Implement more location checks
Make the following modifications to APIs and required permissions.
Move the following APIs from checking coarse permission to fine
permission (except for apps targeting pre-Q):
TelephonyManager.getCellLocation()
(deprecated) TelephonyManager.getNeighboringCellInfo()
TelephonyManager.getAllCellInfo()
TelephonyManager.requestCellInfoUpdate()
PhoneStateListener#onCellLocationChanged
PhoneStateListener#onCellInfoChanged
Start checking for fine permission on the following APIs:
(Note -- these will only be logged, not denied until a future CL)
TelephonyManager.requestNetworkScan()
TelephonyScanManager.requestNetworkScan()
NetworkScanCallback#onResults
Start checking for coarse permission on the following APIs:
(Note -- these will only be logged, not denied until a future CL)
TelephonyManager#getAvailableNetworks
TelephonyManager#getServiceStateForSubscriber and #getServiceState
PhoneStateListener#onServiceStateChanged
Bug:
116258458
Test: manual via testapps
Change-Id: I45326ddacbcf538da50ca544d67eed12cf0c0861
Leland Miller [Wed, 13 Feb 2019 18:31:31 +0000 (10:31 -0800)]
Move RCS table creation flag to contract class
This will allow access to the flag outside of the test package. In
particular, we can now use this flag to disable the relevant CTS tests
when RCS tables are not created.
Test: Manually ensured the flag works using CtsRcsTestCases
Change-Id: I995f38c83d52c3a23131f223a550cf71e59b9cba
Nathan Harold [Wed, 13 Feb 2019 18:17:36 +0000 (18:17 +0000)]
Merge "Add missing UARFCN Getter to CellIdentityTdscdma"
Fan Zhang [Wed, 13 Feb 2019 18:04:09 +0000 (18:04 +0000)]
Merge "Revert "Enable static overlay for SettingsLib resources""
Fan Zhang [Wed, 13 Feb 2019 18:00:16 +0000 (18:00 +0000)]
Revert "Enable static overlay for SettingsLib resources"
This reverts commit
6828b0f191e49859345d81694282e1dcda599462.
Fixes:
124370422
Reason for revert: b/
124370422
Error:
The following topic from AOSP:
https://android-review.googlesource.com/q/topic:%
22116821732%22+(status:open%20OR%20status:merged)
Has broken several builds (test_suites_x86_64, build_test, docs) with the following error:
FAILED:
build/make/core/aapt2.mk:33: error: overriding commands for target `out/target/common/obj/APPS/SetupWraith_intermediates/flat-res/frameworks/base/packages/SettingsLib/res/color_batterymeter_bolt_color.xml.flat', previously defined at build/make/core/aapt2.mk:33
05:05:47 ckati failed with: exit status 1
make: *** [run_soong_ui] Error 1
Return Code: 2
Change-Id: I9b980c512eb354f87470bcefe1df095fc5c9a807
Jordan Liu [Fri, 1 Feb 2019 22:15:05 +0000 (14:15 -0800)]
Add UNINITIALIZED and rename INVALID
UNINITIALIZED_CARD_ID is for before the card ID is ready.
INVALID_CARD_ID is renamed to UNSUPPORTED_CARD_ID and it is used if the
card ID is known to be unsupported.
Bug:
122978614
Test: atest UiccControllerTest
Change-Id: Ia2315d9b38ef35b30d9b96b6436c08fa4404e4df
Merged-In: Ia2315d9b38ef35b30d9b96b6436c08fa4404e4df
Blake Kragten [Wed, 13 Feb 2019 17:21:30 +0000 (17:21 +0000)]
Merge "Modem power monitor"
Blake Kragten [Tue, 12 Feb 2019 19:16:49 +0000 (11:16 -0800)]
Modem power monitor
This is an AOSP carry over for the frameworks base CL. This change is needed here to allow telephony changes to be added to AOSP with no issues.
Adding monitored power rail as a new cellular battery stats component. This will be used to better determine actual power usage of the modem rather than relying on battery reduction rates.
If the device does not support rail power monitoring then this value
will always remain at 0.
Test: adb shell dumpsys activity service TelephonyDebugService --metrics
Results Examples:
Energy consumed by modem (mAh): 2.41
Change-Id: If85af2f2e1b255661e189c5375ecc5825be84c58
Paul Duffin [Mon, 11 Feb 2019 16:13:25 +0000 (16:13 +0000)]
Add :frameworks-base-api-current.txt filegroup
Needed by external/apache-http/Android.bp.
Bug:
119021844
Test: make checkbuild
Change-Id: Iab599d0e85524d2efa0aee9358a602e3da9931ad
Paul Duffin [Wed, 13 Feb 2019 10:12:46 +0000 (10:12 +0000)]
Merge "Use filegroup name not contents in $(location ...)"
Hans Boehm [Wed, 13 Feb 2019 05:14:43 +0000 (05:14 +0000)]
Merge "Adjust AsyncTask.THREAD_POOL_EXECUTOR config"
Treehugger Robot [Wed, 13 Feb 2019 03:55:47 +0000 (03:55 +0000)]
Merge "Added backwards compatibility support for data reg"
Mengjun Leng [Thu, 24 Jan 2019 02:33:33 +0000 (10:33 +0800)]
SMS: Add a compatible API getRecipientAddress for 3GPP2 SMS
The method getDisplayOriginatingAddress() return null for submit
pdu of 3GPP, it will cause applicatoin can not get address of sent
message. Thread ID is unable to be created for this invalid message
record.
Add an API getRecipientAddress() for SubmitPdu in SmsMessage.
Bug:
73012819
Change-Id: Ib3e98ad3f115038656db1ea7ff5b05491b28b85d
lucaslin [Tue, 12 Feb 2019 07:30:13 +0000 (15:30 +0800)]
Clear all lingering notifications when network is disconnected
In aosp/861571, it tried to refine the design to prevent the
lingering notification is cleared unexpectedly. However, all
notifications should be cleared when network is disconnected.
Refine the design by clearing all lingering notifications when
network is disconnected.
Bug:
123488640
Bug:
123537643
Test: 1.Build pass
2.atest FrameworksNetTests
3.Connect to a hotspot which doesn't have internet,
after getting "NO_INTERNET" notification, disconnect
the wifi and check if "NO_INTERNET" notification will
be cleared or not.
Change-Id: Iac45ec186cf81915c318dba37f43136609d579f6
Mark Chien [Wed, 13 Feb 2019 02:29:01 +0000 (02:29 +0000)]
Merge "Support multi-SIM entitlement check"
Treehugger Robot [Wed, 13 Feb 2019 02:17:35 +0000 (02:17 +0000)]
Merge changes from topic "cut_dependency"
* changes:
Revert "Delay start of bootanimation until after the Runtime APEX is mounted."
Cut the static deps from libandroid_runtime to libnativeloader and libnativebridge
Yutaro Maruyama [Fri, 30 Mar 2018 04:36:37 +0000 (12:36 +0800)]
Improved wipe reason information for RecoverySystem
More information will be useful to investigate unintentional wipe
for users. Added timestamp information into reason text.
Bug:
120586954
Change-Id: I26dd4eff815d736bf34e944be6843cbb80515ca9
Po-Chien Hsueh [Wed, 13 Feb 2019 01:20:26 +0000 (01:20 +0000)]
Merge "Add DynamicAndroidClient"
vichang [Wed, 13 Feb 2019 00:58:37 +0000 (00:58 +0000)]
Merge "Include /apex/com.android.runtime for native library in app classloader"
Pengquan Meng [Wed, 23 Jan 2019 04:06:03 +0000 (20:06 -0800)]
Add getSlotsMapping to TelephonyManager
Bug:
123101769
Test: build
Merged-In: I416d741947b1a15e66ebf71b8104c4b2ec95e310
Change-Id: I416d741947b1a15e66ebf71b8104c4b2ec95e310
(cherry picked from commit
83e7b920deec8d163c3ddd9c56343ce8bcea0a9e)
Fan Zhang [Wed, 13 Feb 2019 00:12:08 +0000 (00:12 +0000)]
Merge "Enable static overlay for SettingsLib resources"
Remi NGUYEN VAN [Wed, 13 Feb 2019 00:10:18 +0000 (00:10 +0000)]
Merge "Check NetworkStack UID and perms before binding"
Brad Ebinger [Tue, 12 Feb 2019 23:55:32 +0000 (23:55 +0000)]
Merge "Telephony: Add 7bit Ascii support for long message"
Hans Boehm [Sat, 2 Feb 2019 01:52:40 +0000 (17:52 -0800)]
Adjust AsyncTask.THREAD_POOL_EXECUTOR config
Remove the queue, reduce core pool size but no longer let it time out.
Reduce the timeout for additional threads.
If necessary, use a special executor, with an unbounded queue, to run
overflow tasks.
Bug:
123762797
Test: AOSP boots, also with MAXIMUM_POOL_SIZE = 1.
Change-Id: I4bc9593a044d1773ff1878684e2397a7c2a9a87a
Chen Xu [Tue, 12 Feb 2019 23:27:36 +0000 (23:27 +0000)]
Merge "Address API feedbacks for networktypebitmask"
Nathan Harold [Tue, 12 Feb 2019 23:18:15 +0000 (23:18 +0000)]
Merge "Add NR Cell Identity to CellIdentityNr"
Treehugger Robot [Tue, 12 Feb 2019 22:48:41 +0000 (22:48 +0000)]
Merge "RESTRICT AUTOMERGE: Manually merge
885aca1bbaa076b11914b9e4cb0d2a6d0c6fab3a to aosp-master"
Jack Yu [Thu, 31 Jan 2019 21:30:05 +0000 (13:30 -0800)]
Added backwards compatibility support for data reg
Test: Manual
Bug: Bug:
73659459
Change-Id: Ib254f5bf77cbc429826a58f55babbb971db61175
Nathan Harold [Tue, 12 Feb 2019 18:20:46 +0000 (10:20 -0800)]
Add missing UARFCN Getter to CellIdentityTdscdma
Add a method to get the UARFCN for CellIdentityTdscdma.
There is an equivalent method in all the other classes,
so this is simply correcting an oversight.
Bug:
123957505
Test: atest CellIdentityTdscdmaTest
Change-Id: I743d90b4532b86edb34d267ae55eca73de2a0086
Nathan Harold [Sat, 9 Feb 2019 01:34:43 +0000 (17:34 -0800)]
Add NR Cell Identity to CellIdentityNr
Add the NCI to CellIdentityNr.
Bug:
124126359
Test: atest CellIdentityNrTest
Change-Id: I628048c61d3d6b6e2439357e8233c483a3c0d1d4
Treehugger Robot [Tue, 12 Feb 2019 19:31:18 +0000 (19:31 +0000)]
Merge "Mark FrameMetricsObserver::notify() as pure virtual"
Hui Yu [Fri, 8 Feb 2019 23:28:45 +0000 (15:28 -0800)]
RESTRICT AUTOMERGE: Manually merge
885aca1bbaa076b11914b9e4cb0d2a6d0c6fab3a to aosp-master
To pick up statsd atom ProcessStartTime.
Bug: None.
Test: NA.
Change-Id: If6b99c0b6b501036ffde1e9a45194a039a8d7c73
Merged-In: Ifcc0c80f1da45c2ff89f7c88da6407ba777473e2
chen xu [Mon, 28 Jan 2019 03:41:40 +0000 (19:41 -0800)]
Address API feedbacks for networktypebitmask
1. change networktypebitmask from int to long
2. right shift definition by 1 for each bitmask, in consistent with
NW bitmask used in APN settings
3. add missing definition for IWLAN
Bug:
119118373
Test: atest CtsTelephonyTestCases:TelephonyManagerTest#testGetRadioAccessFamily
Change-Id: Idf0f88225c20fc0ed10ae4fccb705f988a3bec60
(cherry picked from commit
75b486e4c820e4d51c258fea43f959c92d797725)
Merged-in: Idf0f88225c20fc0ed10ae4fccb705f988a3bec60
Treehugger Robot [Tue, 12 Feb 2019 18:35:23 +0000 (18:35 +0000)]
Merge "Schematize ADB system properties"
Jordan Liu [Tue, 12 Feb 2019 18:29:24 +0000 (10:29 -0800)]
Update documentation for SubscriptionManager listener
This will match the documentation in TM.listen() and PhoneStateListener.
Bug:
124204168
Test: no behavior change
Change-Id: Ifde6382e4b6947417a89032805499c48288f8438
Steven Moreland [Tue, 12 Feb 2019 18:29:24 +0000 (18:29 +0000)]
Merge "Remove duplicate networkstack-aidl-interfaces-java"
Steven Moreland [Tue, 12 Feb 2019 17:51:35 +0000 (17:51 +0000)]
Merge "Remove ParcelFileDescriptor.aidl"
Treehugger Robot [Tue, 12 Feb 2019 17:32:40 +0000 (17:32 +0000)]
Merge "Remove unused build variable framework_docs_args"
Jack Yu [Tue, 12 Feb 2019 16:52:48 +0000 (16:52 +0000)]
Merge "Removed unused variables in cat service"
Victor Chang [Thu, 7 Feb 2019 15:20:25 +0000 (15:20 +0000)]
Include /apex/com.android.runtime for native library in app classloader
Bug:
123702996
Test: Manual test. After moving libicuuc.so into the apex path,
call System.loadLibrary("icuuc") in test app
Test: CtsJniTestCases pass after moving libicuuc into apex and applied
CTS patch here. http://r.android.com/898053
Change-Id: Ic9049c1595b4ea029ec65649c3f3283672744569