OSDN Git Service
Ryan Mitchell [Sat, 16 Feb 2019 02:50:21 +0000 (18:50 -0800)]
Merge "Check intent action in OMS.PackageReceiver for secure coding"
am:
e705e26703
Change-Id: Ic73dbe9bf5fe1f5b711ee24adbc72c1b066a63a4
Ryan Mitchell [Sat, 16 Feb 2019 02:36:41 +0000 (02:36 +0000)]
Merge "Check intent action in OMS.PackageReceiver for secure coding"
Stanley Tng [Sat, 16 Feb 2019 02:04:29 +0000 (18:04 -0800)]
[automerger skipped] Merge "Fix the bad link due to typo"
am:
c0c27fbf49 -s ours
am skip reason: change_id Ia06e1fffd814671289a1caebd5962aedc18a28d7 with SHA1
a44f2c075b is in history
Change-Id: Ib00807a7f22c339551aa750459b4a7c0398618e4
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:56:22 +0000 (17:56 -0800)]
Merge "Sign networkstack with its own certificate"
am:
fd2d7dc685
Change-Id: I24ddb16d7a163ad6141b4f6c46e5dda9f249a906
Remi NGUYEN VAN [Sat, 16 Feb 2019 01:48:49 +0000 (01:48 +0000)]
Merge "Sign networkstack with its own certificate"
TreeHugger Robot [Sat, 16 Feb 2019 00:53:47 +0000 (00:53 +0000)]
Merge "Fix the incorrect javadoc links" into stage-aosp-master
Remi NGUYEN VAN [Sat, 16 Feb 2019 00:38:52 +0000 (16:38 -0800)]
Merge "Fix framework and NetworkStack classes conflicts"
am:
3f23efdd13
Change-Id: I8c207040c42a3d02b8383e13a4f839c250788f58
Elliott Hughes [Sat, 16 Feb 2019 00:26:01 +0000 (16:26 -0800)]
Merge "zygote: use async signal safe log to record child process death"
am:
2555ed5bca
Change-Id: I9734da9897528cfc3b6c4b45d56eb6454ec435c8
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
Nan Zhang [Fri, 12 Oct 2018 00:54:36 +0000 (17:54 -0700)]
Fix the incorrect javadoc links
A lot of unresolved link errors showing up after go/ag/
5172152.
Test: m -j docs with -lerror enabled
Bug: b/
116163454
Change-Id: I74d1f75e0f00015410a63e13103c28a9c84b4fe0
Dichen Zhang [Fri, 15 Feb 2019 22:02:59 +0000 (14:02 -0800)]
Merge "HLS seeking: call readAt() on new thread"
am:
f9d7df6f78
Change-Id: Idf8a6341cdb8a2bf9478aa523e8066d96089e598
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:43:51 +0000 (13:43 -0800)]
Merge "Populate 'hasKnownUserIntentEmergency'"
am:
59d8275546
Change-Id: If7167ecae8c4de2cfb3a8032beb350fe1e327f32
Max Bires [Fri, 15 Feb 2019 21:32:51 +0000 (13:32 -0800)]
Merge "Adding framework check for 3DES key size"
am:
a24d025212
Change-Id: Id71784688902c0fc1d490b1fd8321fae134166b5
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:46:35 +0000 (10:46 -0800)]
Merge "No-op flag to keep tests working in this branch."
am:
2144164526
Change-Id: I7723ff61f7c0f6f5f0bf560b2baa16ffda85dffb
Leland Miller [Fri, 15 Feb 2019 18:37:18 +0000 (10:37 -0800)]
Merge "Move RCS table creation flag to contract class"
am:
0c8bc10ab2
Change-Id: I81f0a24320171fee4d20b661c08d8144e84df181
Jeff Sharkey [Fri, 15 Feb 2019 18:34:31 +0000 (18:34 +0000)]
Merge "No-op flag to keep tests working in this branch."
Todd Kennedy [Fri, 15 Feb 2019 18:28:55 +0000 (10:28 -0800)]
Merge "Add new file to owners"
am:
eda6f2401f
Change-Id: I7e8296b1af33739ce906e53efd586ed7d6d98cca
Christian Wailes [Fri, 15 Feb 2019 18:24:31 +0000 (10:24 -0800)]
Merge "Fix loop iteration bug."
am:
1a74681173
Change-Id: I0f01f27d328b242cf8c102bbfe70324d9d263ce9
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
Varun Anand [Fri, 15 Feb 2019 11:45:03 +0000 (03:45 -0800)]
Merge "Update VPN capabilities when its underlying network set is null."
am:
e3ae238f4a
Change-Id: Id4560d201a40f5e1b1617819991da99d86379dbe
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 11:01:11 +0000 (03:01 -0800)]
Merge "Move NetworkStack to services.net"
am:
762f9f0c24
Change-Id: Iab45985aedb8069ad50fd2913ef6e828989cdd0d
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 [Fri, 15 Feb 2019 08:30:39 +0000 (00:30 -0800)]
Merge "Add NetworkStackTests to device-tests suite"
am:
d989ed753d
Change-Id: Id965eaf17cc0f4a042adb5df7387f3326451cd4f
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:26:34 +0000 (00:26 -0800)]
Merge "Remove NetworkMonitor dependency on ICaptivePortal"
am:
bfe928d593
Change-Id: Ia0d06e1aa931cdc1c6dd4008e804a6a44ae2304f
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:16:09 +0000 (20:16 -0800)]
Merge "Fix testApfFilterKeepaliveAck."
am:
60e7162e05
Change-Id: I9bfebe02c0d4bc9c389e1303017b8c46ad9aea2c
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 [Fri, 15 Feb 2019 03:29:49 +0000 (19:29 -0800)]
Merge "Remove deps from framework on netd interfaces"
am:
d36e3df7b0
Change-Id: I341533244d9c7cd2c1cf8315f0806695310ba03c
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:57:09 +0000 (16:57 -0800)]
Merge "Prevent 3rd party app from turning on speaker during the system call Test: manual"
am:
cec740470c
Change-Id: I1b4db443f1e112a25d69a03e0b81af1595db5686
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 [Fri, 15 Feb 2019 00:09:08 +0000 (16:09 -0800)]
Merge "SMS: Add a compatible API getRecipientAddress for 3GPP2 SMS"
am:
ca2abcf735
Change-Id: I64c5a75551809204b6eb6a4d67faf248cc27f6bf
Brad Ebinger [Thu, 14 Feb 2019 23:40:44 +0000 (23:40 +0000)]
Merge "SMS: Add a compatible API getRecipientAddress for 3GPP2 SMS"
Xin Li [Thu, 14 Feb 2019 22:11:32 +0000 (22:11 +0000)]
Merge "DO NOT MERGE - Merge pi-platform-release (PPRL.190205.001) into stage-aosp-master" into stage-aosp-master
Chris Wailes [Thu, 14 Feb 2019 22:04:13 +0000 (14:04 -0800)]
Merge "Fixed a typo in an OWNERS file."
am:
b3be864186
Change-Id: I363159d1cbaa904d9ffc7d70e1d8cd684cfcfd4a
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:49:48 +0000 (10:49 -0800)]
Merge "Add Test Network and Transport types"
am:
0dddb902ae
Change-Id: I1cf33485adb9f4c442de42060697efe71bb45264
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 17:52:01 +0000 (17:52 +0000)]
Merge "Schematize ADB system properties" into stage-aosp-master
Xin Li [Thu, 14 Feb 2019 06:36:25 +0000 (22:36 -0800)]
DO NOT MERGE - Merge pi-platform-release (PPRL.190205.001) into
stage-aosp-master
Bug:
124234733
Change-Id: Ic4f67fde0835da0b1c363906cccef0d244e38393
Paul Duffin [Thu, 14 Feb 2019 12:42:22 +0000 (04:42 -0800)]
Merge "Add :frameworks-base-api-current.txt filegroup"
am:
5de80df81e
Change-Id: Ib9d5223dd891ae7471030bbc41e59f969c5de0a3
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:37:44 +0000 (23:37 -0800)]
Merge "Use ServiceState to get data cell ID"
am:
a75c52c3df
Change-Id: Icc0b977c607c47bd28f07e6fb67d02a3de3bedde
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 05:17:18 +0000 (21:17 -0800)]
Merge "Don't run doc-comment-check-docs for update-api"
am:
db400ed187
Change-Id: I287e1dadaa4e2050865ebe26a2e481e027c8dd0a
Hongshik [Thu, 14 Feb 2019 05:08:32 +0000 (21:08 -0800)]
Merge "Add "close" socket option for immediately close socket after finish check captive portal."
am:
5751278992
Change-Id: Ifae5a6889fc20bcd7f4269205c33e3e7fa6bd8f0
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."
Remi NGUYEN VAN [Thu, 14 Feb 2019 04:42:01 +0000 (20:42 -0800)]
Merge "Fix flaky testNattSocketKeepalives"
am:
16758070d0
Change-Id: Ie9fe40e3bcf4187a2e5cbf525bc4e874cff70747
Shuo Qian [Thu, 14 Feb 2019 04:38:03 +0000 (20:38 -0800)]
Merge "Call e.rethrowFromSystemServer() to exception of setDefaultSmsSubId"
am:
6cc4c0c029
Change-Id: I17375b97d6c695f810ea23d6682bb598c5a55b35
Chiachang Wang [Thu, 14 Feb 2019 04:33:46 +0000 (20:33 -0800)]
Merge "Add build rule of data stall proto"
am:
f9727b43cb
Change-Id: I0ec765ab554fb83bcaad5abb8131bb56d39401b7
Lucas Lin [Thu, 14 Feb 2019 04:29:03 +0000 (20:29 -0800)]
Merge "Clear all lingering notifications when network is disconnected"
am:
1037bbb82a
Change-Id: I2d9f84840cdc73ed3b30278d7a9dbeefff233fa3
Sehee Park [Thu, 14 Feb 2019 04:21:56 +0000 (20:21 -0800)]
Merge "Enable DOM storage API for CaptivePortalLoginActivity"
am:
f7150486bf
Change-Id: Ie6e99f0c8ddeb28086197b291c198fa115f6e157
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:30:26 +0000 (16:30 -0800)]
Merge "Add UNINITIALIZED and rename INVALID"
am:
b8493ac5eb
Change-Id: Idd2ef2a91aab0e28743762ea4860b49a02e8389b
Jordan Liu [Thu, 14 Feb 2019 00:14:11 +0000 (00:14 +0000)]
Merge "Add UNINITIALIZED and rename INVALID"
Hall Liu [Thu, 14 Feb 2019 00:12:55 +0000 (16:12 -0800)]
Merge "Implement more location checks"
am:
a3aae9fe4b
Change-Id: Ia72a3fba1718a6e021b549fce92f096c3d7f0c9b
Hall Liu [Wed, 13 Feb 2019 23:21:43 +0000 (23:21 +0000)]
Merge "Implement more location checks"
Hui Yu [Wed, 13 Feb 2019 23:11:57 +0000 (15:11 -0800)]
Merge "Manually merge
885aca1bbaa076b11914b9e4cb0d2a6d0c6fab3a to aosp-master"
am:
2f199d6b35
Change-Id: I385330c5d2d547dc12d8f5c21cccaf34289ce3af
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
Pengquan Meng [Wed, 13 Feb 2019 23:03:35 +0000 (15:03 -0800)]
Merge "Add getSlotsMapping to TelephonyManager"
am:
600827273c
Change-Id: I7eace0e5cc7cd3f58cdddde3837a7c8b714e08ba
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:36:54 +0000 (12:36 -0800)]
[automerger skipped] Merge "Revert "RESTRICT AUTOMERGE: Manually merge
885aca1bbaa076b11914b9e4cb0d2a6d0c6fab3a to aosp-master""
am:
539c545dc7 -s ours
am skip reason: subject contains skip directive
Change-Id: I6ec149021a6e62e43c7d671e7ae55b2c59a728cc
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""