OSDN Git Service
Andrei Onea [Fri, 15 Feb 2019 13:50:47 +0000 (13:50 +0000)]
Use sampled value in hidden api logger
The hidden api logger interface also receives the actual sampled value.
This is an intermediate step before a new logging method is added.
Test: m
Bug:
119217680
(cherry picked from commit
31bde163932dab75a8301e43b2adcb684f0470ec)
Change-Id: I3345bdcdf57e1f60970c85572e503d7b33af7148
Merged-In: I707a2624a254a80391cdae277dd59daa503d055f
Xiangyu/Malcolm Chen [Wed, 20 Feb 2019 05:25:00 +0000 (05:25 +0000)]
Merge "Adding validate before switch feature."
Tyler Gunn [Wed, 20 Feb 2019 04:40:13 +0000 (04:40 +0000)]
Merge "Add support for Telecom logging to obfuscate string phone numbers."
Xiangyu/Malcolm Chen [Wed, 20 Feb 2019 02:58:09 +0000 (02:58 +0000)]
Merge "Move getPhoneCount implementation back to TelephonyManager."
Malcolm Chen [Fri, 25 Jan 2019 00:33:51 +0000 (16:33 -0800)]
Adding validate before switch feature.
In CBRS DSDS mode, switching data to CBRS network will require
validation first. Adding a component of CellularNetworkValidator
to trigger the validation and pass the result back to PhoneSwitcher.
Bug:
118348832
Test: manual
Change-Id: I689aa494f031834b5cee76906922ebdafa9c77ed
Merged-In: I689aa494f031834b5cee76906922ebdafa9c77ed
Hall Liu [Wed, 20 Feb 2019 01:08:04 +0000 (01:08 +0000)]
Merge "Turn on enforcing mode for Q-based location APIs"
Shuo Qian [Wed, 20 Feb 2019 01:08:03 +0000 (01:08 +0000)]
Merge "Add 'hasKnownUserIntentEmergency' into ImsCallProfile Parcel"
Malcolm Chen [Thu, 31 Jan 2019 05:19:57 +0000 (21:19 -0800)]
Move getPhoneCount implementation back to TelephonyManager.
Moving it inside iTelephony creates problems. Some components call
getPhoneCount during initialization while iTelephony service is not
even running, which will cause phone process to crash.
Bug:
123667461
Test: manual
Change-Id: I51199eaf0bd87055c21fe61af50f4c353137d621
Merged-In: I51199eaf0bd87055c21fe61af50f4c353137d621
sqian [Thu, 14 Feb 2019 22:58:03 +0000 (14:58 -0800)]
Add 'hasKnownUserIntentEmergency' into ImsCallProfile Parcel
Test: Treehugger
Bug:
123999640
Change-Id: Ie68a02a7e0f9aabe5dbc37806a495169feb63765
Merged-In: Ie68a02a7e0f9aabe5dbc37806a495169feb63765
(cherry picked from commit
0c86fbf491f4781ef3be68ba51aa3bfdb0bd7bc0)
Treehugger Robot [Tue, 19 Feb 2019 22:21:05 +0000 (22:21 +0000)]
Merge "[DO NOT MERGE] Support trace command on Window Manager dumpsys"
Dmitry Dementyev [Tue, 19 Feb 2019 19:49:13 +0000 (19:49 +0000)]
Merge "Lazely initialize AccountManager debug table."
Treehugger Robot [Tue, 19 Feb 2019 18:18:40 +0000 (18:18 +0000)]
Merge "Convert Android.mk file to Android.bp"
Dario Freni [Tue, 19 Feb 2019 15:43:35 +0000 (15:43 +0000)]
Merge "Add dariofreni to APEX-related files owners."
Nicolas Geoffray [Tue, 19 Feb 2019 14:28:18 +0000 (14:28 +0000)]
Merge "Add a dalvik.vm.boot-image option for zygote and installd."
Dario Freni [Mon, 18 Feb 2019 17:53:24 +0000 (17:53 +0000)]
Add dariofreni to APEX-related files owners.
Test: n/a
Change-Id: I3a26033f52d98e5edcde852fff007ba33ae90856
Adam Vartanian [Tue, 19 Feb 2019 09:27:35 +0000 (09:27 +0000)]
Merge "Fix authority parsing test"
Adam Vartanian [Mon, 18 Feb 2019 12:01:11 +0000 (12:01 +0000)]
Fix authority parsing test
The test has been failing because http://r.android.com/793302 changed
how the port separator was found, only scanning ASCII digits until it
hits a colon, and previously it would scan for the colon and then
percent-decode the rest of it. The new behavior actually better
matches the WHATWG URL parsing algorithm [1], which specifies that
ports only include ASCII digits. It does mean that some edge cases
that previously parsed as host "foo", port 42 will now parse as
host "foo:42", no port, but those URLs wouldn't be accepted by
browsers so they should be exceedingly rare.
The behavior per the WHATWG spec would be to fail to parse in the case
of a percent-encoded character in the port section, but this class is
specifically documented to accept garbage, so lumping the mis-encoded
port as part of the hostname (which will result in a hostname that's
invalid and impossible to resolve) seems like the best option.
[1] https://url.spec.whatwg.org/#port-state
Fixes:
124360078
Test: atest android.net.UriTest
Change-Id: I1c788cb7703c821ae74b542b74d89e10cba5a546
Treehugger Robot [Tue, 19 Feb 2019 02:02:35 +0000 (02:02 +0000)]
Merge "Fix for testLifecycleOnMoveToFromSplitScreenRelaunch"
Treehugger Robot [Mon, 18 Feb 2019 19:11:00 +0000 (19:11 +0000)]
Merge "Force blacklist on VMRuntime.setTargetSdkVersion*()"
Jakub Gielzak [Mon, 18 Feb 2019 18:24:58 +0000 (18:24 +0000)]
Merge "Revert "Remove legacy-test and legacy-android-test targets""
Jakub Gielzak [Mon, 18 Feb 2019 18:24:17 +0000 (18:24 +0000)]
Revert "Remove legacy-test and legacy-android-test targets"
This reverts commit
3b0be60307cc6063795f8cd32356745ee371e757.
Reason for revert: Broken build
Change-Id: I71270c7b47163ab7147029f2d3961d1848fdd9eb
Anton Hansson [Mon, 18 Feb 2019 18:03:36 +0000 (18:03 +0000)]
Merge "Specify no resource_dirs for SystemUI"
Paul Duffin [Mon, 18 Feb 2019 15:13:45 +0000 (15:13 +0000)]
Merge "Remove legacy-test and legacy-android-test targets"
David Brazdil [Mon, 18 Feb 2019 14:59:20 +0000 (14:59 +0000)]
Force blacklist on VMRuntime.setTargetSdkVersion*()
The methods could be used to bypass the restrictions. Force them
onto the blacklist.
Test: builds
Change-Id: I77d1fb8ca7339bec5e933f87a3b672096e2e559e
Jin Seok Park [Mon, 18 Feb 2019 14:56:06 +0000 (14:56 +0000)]
Merge "Add OWNERS for ExifInterface"
Anton Hansson [Fri, 8 Feb 2019 09:01:32 +0000 (09:01 +0000)]
Specify no resource_dirs for SystemUI
The res directory is already included via the SystemUI-core
library. The default for resource_dirs is ["res"] if it exists,
so explicitly clear it to avoid depending on it twice.
Bug:
124035856
Test: m SystemUI
Change-Id: Ia1b06cd9eff4e614684efde34288cf9ebd895870
Xiao Ma [Mon, 18 Feb 2019 07:12:04 +0000 (07:12 +0000)]
Merge "Replace TcpSocketInfo with TcpKeepalivePacketDataParcelable in ApfTest."
Jin Seok Park [Mon, 11 Feb 2019 08:27:09 +0000 (17:27 +0900)]
Add OWNERS for ExifInterface
Adding specific owners for ExifInterface in order to make sure
AndroidX code is changed when framework code is changed.
Bug:
122276930
Test: N/A
Change-Id: Icf0d74ad915d4b322a70c74762753411ad96bbb1
Remi NGUYEN VAN [Mon, 18 Feb 2019 01:07:51 +0000 (01:07 +0000)]
Merge "Rename NetworkStack package"
Ryan Mitchell [Sat, 16 Feb 2019 02:36:41 +0000 (02:36 +0000)]
Merge "Check intent action in OMS.PackageReceiver for secure coding"
Treehugger Robot [Sat, 16 Feb 2019 01:56:30 +0000 (01:56 +0000)]
Merge "Fix the bad link due to typo"
Remi NGUYEN VAN [Sat, 16 Feb 2019 01:48:49 +0000 (01:48 +0000)]
Merge "Sign networkstack with its own certificate"
Hall Liu [Thu, 14 Feb 2019 01:01:03 +0000 (17:01 -0800)]
Turn on enforcing mode for Q-based location APIs
Also fix some logging.
Bug:
116258458
Test: manual, unit
Change-Id: I370aae906760365d9cd2a35b456d8ff8522c0902
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"
Stanley Tng [Fri, 15 Feb 2019 21:13:45 +0000 (13:13 -0800)]
Fix the bad link due to typo
Replaces the link with the new API name, createInsecureL2capChannel.
Bug:
70683224
Test: Compile
Change-Id: I9580d90722f8b0c0146a902bb5fcace4ef58d421
Merged-In: Ia06e1fffd814671289a1caebd5962aedc18a28d7
Dmitry Dementyev [Wed, 16 Jan 2019 23:38:17 +0000 (15:38 -0800)]
Lazely initialize AccountManager debug table.
Prevent crash if the database cannot be opened.
Guard not thread safe SQLiteStatement.
Test: atest com.android.server.accounts
Change-Id: Idab30703facacb469a568361998c59c039d3dd2a
Merged-In: I2af9074e50bddc5a1d18ea781cc6f56934f21302
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"
Sasha Smundak [Mon, 11 Feb 2019 23:29:47 +0000 (15:29 -0800)]
Convert Android.mk file to Android.bp
See build/soong/README.md for more information.
Bug:
122332340
Test: treehugger
Change-Id: I89cb31814f1442c91c31e5b867501d768679230e
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"
Xiao Ma [Fri, 15 Feb 2019 10:18:21 +0000 (19:18 +0900)]
Replace TcpSocketInfo with TcpKeepalivePacketDataParcelable in ApfTest.
Test: atest NetworkStackTests
Change-Id: I95fde70c07b398a2a2f734f35165870284a3959c
Paul Duffin [Thu, 14 Feb 2019 12:52:50 +0000 (12:52 +0000)]
Remove legacy-test and legacy-android-test targets
Fixes up the android.test.legacy target to stop using sources directly
now that the issue with android.test.runner-minus-junit not being able
to be built against the SDK has been resolved.
Also, fixes a couple of comments.
Bug:
63127064
Test: make checkbuild
Change-Id: If38fa0d87b36343896e97efb2269ac070810db84
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"
Nicolas Geoffray [Thu, 14 Feb 2019 15:55:20 +0000 (15:55 +0000)]
Add a dalvik.vm.boot-image option for zygote and installd.
Bug:
119800099
Test: adb shell setprop dalvik.vm.boot-image "/system/framework/boot.art"
Change-Id: Iccafc56b5c95e848efca2699e16306a26d856478
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
Tyler Gunn [Wed, 13 Feb 2019 21:15:56 +0000 (13:15 -0800)]
Add support for Telecom logging to obfuscate string phone numbers.
Test: Manual
Bug:
117472746
Change-Id: I48e29fd9a6ab1d41fdefb55393c7c326ec72a87f
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