OSDN Git Service
Raman Tenneti [Wed, 20 Feb 2019 16:48:13 +0000 (08:48 -0800)]
[automerger skipped] Fix merge problems with cherry-picking "Add notification settings to backup&restore" change into pi-dev
am:
31a61f6348 -s ours
am skip reason: change_id I421c7487955ee339f88e3957c973375d0f87e2ff with SHA1
95bd7221f6 is in history
Change-Id: I76722b24202892034148a1c1030b8ca4d3417797
Andrei-Valentin Onea [Wed, 20 Feb 2019 15:04:44 +0000 (07:04 -0800)]
Merge "Use sampled value in hidden api logger"
am:
619ed85e81
Change-Id: Ib6ff5b5aa75d1b35bf91748f260bab14aa6eabab
Andrei-Valentin Onea [Wed, 20 Feb 2019 14:49:10 +0000 (14:49 +0000)]
Merge "Use sampled value in hidden api logger"
Adrian Roos [Wed, 20 Feb 2019 13:03:59 +0000 (05:03 -0800)]
Merge "Fix potential memory leak in SomeArgs"
am:
8a71e01423
Change-Id: I007ff55f39a3239c530c30306409b498ac066801
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
Adrian Roos [Wed, 20 Feb 2019 12:50:28 +0000 (12:50 +0000)]
Merge "Fix potential memory leak in SomeArgs"
Rubin Xu [Wed, 20 Feb 2019 12:15:55 +0000 (04:15 -0800)]
Merge "Skip unreachable route when estimating VPN destinations"
am:
21078b1edd
Change-Id: Iafa9ecaf07a36f235b366655d2fa2165a676d1cd
Treehugger Robot [Wed, 20 Feb 2019 12:00:15 +0000 (12:00 +0000)]
Merge "Skip unreachable route when estimating VPN destinations"
Sehee Park [Wed, 20 Feb 2019 11:35:36 +0000 (03:35 -0800)]
Merge "Consider 200 response with "Content-length <= 4" to not be a captive portal."
am:
1d18e60e76
Change-Id: I8316ad19bb5633e5c6d64d6c7e589b4bb4548617
Treehugger Robot [Wed, 20 Feb 2019 11:14:24 +0000 (11:14 +0000)]
Merge "Consider 200 response with "Content-length <= 4" to not be a captive portal."
Bin Chen [Wed, 20 Feb 2019 09:34:04 +0000 (17:34 +0800)]
Fix potential memory leak in SomeArgs
When recycling SomeArgs in pool, some fields are not set to null.
Which result potential memory leak as SomeArgs in pool still holds
the reference object.
To fix this issue, clear all args when recycling.
Change-Id: Ie730c3889da948c60ef746ddbe2e926d94ad7e06
Signed-off-by: Bin Chen <bin0515@gmail.com>
Signed-off-by: Wei Huang <hwbest.v@gmail.com>
Xiangyu/Malcolm Chen [Wed, 20 Feb 2019 05:38:21 +0000 (21:38 -0800)]
Merge "Adding validate before switch feature."
am:
f2cf09c945
Change-Id: Ie3f4429c1d7efefb83cf8289481a37adddd83801
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:57:50 +0000 (20:57 -0800)]
Merge "Add support for Telecom logging to obfuscate string phone numbers."
am:
ae941732bb
Change-Id: I3ca1652cfd23ad3f94991c21e5072d4082cc20c8
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 03:10:34 +0000 (19:10 -0800)]
Merge "Move getPhoneCount implementation back to TelephonyManager."
am:
7d6e085229
Change-Id: I5bca6f3d4db132fbf4a0086d38d57ccda53c2780
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:27:02 +0000 (17:27 -0800)]
Merge "Turn on enforcing mode for Q-based location APIs"
am:
5bc4949f3f
Change-Id: I5bbc816a59c8155a89109d8cc77dd4bd1536bd2a
Shuo Qian [Wed, 20 Feb 2019 01:22:07 +0000 (17:22 -0800)]
Merge "Add 'hasKnownUserIntentEmergency' into ImsCallProfile Parcel"
am:
9102b10a00
Change-Id: I91088e4dda584b102409f4007b25f405d538464f
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)
Nataniel Borges [Tue, 19 Feb 2019 22:36:36 +0000 (14:36 -0800)]
[automerger skipped] Merge "[DO NOT MERGE] Support trace command on Window Manager dumpsys"
am:
b829ad7b17 -s ours
am skip reason: subject contains skip directive
Change-Id: I71edd61462c4f7b276a207d7efca6a5f82bb0a3e
Treehugger Robot [Tue, 19 Feb 2019 22:21:05 +0000 (22:21 +0000)]
Merge "[DO NOT MERGE] Support trace command on Window Manager dumpsys"
Raman Tenneti [Wed, 6 Feb 2019 00:34:43 +0000 (16:34 -0800)]
Fix merge problems with cherry-picking "Add notification settings to backup&restore" change into pi-dev
On 9/28 CL https://googleplex-android-review.git.corp.google.com/
5116913 was checked into pi-dev. Merge was bad(couple of lines were lost during merge).
https://b.corp.google.com/issues/
35655737#comment34
Adding LOCK_SCREEN_ALLOW_PRIVATE_NOTIFICATIONS and LOCK_SCREEN_SHOW_NOTIFICATIONS to SETTINGS_TO_BACKUP array. This fixes apct/framework/presubmit test failure.
Bug:
35655737
Bug:
118674794
Test: presubmit unit tests
Change-Id: I2e9cc95e8827e72ef3c09910d4d3e089bde375e5
Merged-In: I421c7487955ee339f88e3957c973375d0f87e2ff
(cherry picked from commit
33a11bd0e3c29937af311bc55bbbe36ee63608f4)
TreeHugger Robot [Tue, 19 Feb 2019 22:13:43 +0000 (22:13 +0000)]
Merge "Fix merge problems with cherry-picking "Add notification settings to backup&restore" change into pi-dev" into stage-aosp-master
Dmitry Dementyev [Tue, 19 Feb 2019 20:23:26 +0000 (12:23 -0800)]
Merge "Lazely initialize AccountManager debug table."
am:
18cccec624
Change-Id: If7e12145dfa8e104777956bdab9a743f3f860e24
Dmitry Dementyev [Tue, 19 Feb 2019 19:49:13 +0000 (19:49 +0000)]
Merge "Lazely initialize AccountManager debug table."
Raman Tenneti [Wed, 6 Feb 2019 00:34:43 +0000 (16:34 -0800)]
Fix merge problems with cherry-picking "Add notification settings to backup&restore" change into pi-dev
On 9/28 CL https://googleplex-android-review.git.corp.google.com/
5116913 was checked into pi-dev. Merge was bad(couple of lines were lost during merge).
https://b.corp.google.com/issues/
35655737#comment34
Adding LOCK_SCREEN_ALLOW_PRIVATE_NOTIFICATIONS and LOCK_SCREEN_SHOW_NOTIFICATIONS to SETTINGS_TO_BACKUP array. This fixes apct/framework/presubmit test failure.
Bug:
35655737
Bug:
118674794
Test: presubmit unit tests
Change-Id: I2e9cc95e8827e72ef3c09910d4d3e089bde375e5
Merged-In: I421c7487955ee339f88e3957c973375d0f87e2ff
(cherry picked from commit
33a11bd0e3c29937af311bc55bbbe36ee63608f4)
Sasha Smundak [Tue, 19 Feb 2019 18:32:16 +0000 (10:32 -0800)]
Merge "Convert Android.mk file to Android.bp"
am:
a81d64e940
Change-Id: I8202195e94c616d8b09e76aa01f4d74f098afd3e
Treehugger Robot [Tue, 19 Feb 2019 18:18:40 +0000 (18:18 +0000)]
Merge "Convert Android.mk file to Android.bp"
Rubin Xu [Tue, 19 Feb 2019 16:56:47 +0000 (16:56 +0000)]
Skip unreachable route when estimating VPN destinations
Bug:
122652441
Test: atest com.android.server.connectivity.VpnTest
Test: Establish a IPv4 VPN with minimal routes and check
(dumpsys connectivity) the VPN network does not have INTERNET
capability.
Change-Id: Ic7f19ebb7b7f78a6ffb2a8ec3fc3eca5e5421f57
Dario Freni [Tue, 19 Feb 2019 15:54:42 +0000 (07:54 -0800)]
Merge "Add dariofreni to APEX-related files owners."
am:
9d805ba071
Change-Id: I13e6dda30f6aeaab8654758cd55a0166b019507c
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:44:44 +0000 (06:44 -0800)]
Merge "Add a dalvik.vm.boot-image option for zygote and installd."
am:
80e697a297
Change-Id: Icbdf60640f0a1b5995ad09eba0bee6ed81b50c4a
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:44:45 +0000 (01:44 -0800)]
Merge "Fix authority parsing test"
am:
8ce3609e58
Change-Id: I8554fddceb326c52b85b34a483b3e3791abf2cdc
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
Raj Mamadgi [Tue, 19 Feb 2019 02:13:45 +0000 (18:13 -0800)]
Merge "Fix for testLifecycleOnMoveToFromSplitScreenRelaunch"
am:
43d11758fa
Change-Id: I6b248297523070983c63b5dd870e235eea5ee59c
Treehugger Robot [Tue, 19 Feb 2019 02:02:35 +0000 (02:02 +0000)]
Merge "Fix for testLifecycleOnMoveToFromSplitScreenRelaunch"
Xin Li [Mon, 18 Feb 2019 23:58:30 +0000 (15:58 -0800)]
DO NOT MERGE - Merge PPRL.190205.001 into master
Bug:
124234733
Change-Id: If654c6ab27cf6c376598e02cd3253e0b68ed5395
David Brazdil [Mon, 18 Feb 2019 19:18:40 +0000 (11:18 -0800)]
Merge "Force blacklist on VMRuntime.setTargetSdkVersion*()"
am:
da75e38817
Change-Id: I50ac78d0e85ab34cea2abaef4f44ee8d418e517c
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:32:40 +0000 (10:32 -0800)]
Merge "Revert "Remove legacy-test and legacy-android-test targets""
am:
049c1589ee
Change-Id: Ia84907bfa038954256bc791490a490dd338b33ce
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:16:37 +0000 (10:16 -0800)]
Merge "Specify no resource_dirs for SystemUI"
am:
347d6ff9f9
Change-Id: I0b752a641e5f74d7dac1017616553f464427e219
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:26:09 +0000 (07:26 -0800)]
Merge "Remove legacy-test and legacy-android-test targets"
am:
14daedf747
Change-Id: I67e3a6d58324affcb9119002d4fb2be23e3121fc
Paul Duffin [Mon, 18 Feb 2019 15:13:45 +0000 (15:13 +0000)]
Merge "Remove legacy-test and legacy-android-test targets"
Jin Seok Park [Mon, 18 Feb 2019 15:06:53 +0000 (07:06 -0800)]
Merge "Add OWNERS for ExifInterface"
am:
996d37ea59
Change-Id: I24669310bf259344675110b2e4463894843e776b
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:25:24 +0000 (23:25 -0800)]
Merge "Replace TcpSocketInfo with TcpKeepalivePacketDataParcelable in ApfTest."
am:
e7e5a35b38
Change-Id: I555a4c49a92148a492172a4f2cec993428140cdc
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:15:47 +0000 (17:15 -0800)]
Merge "Rename NetworkStack package"
am:
e4a40c77e1
Change-Id: I0acdbd8716b67241367c78b7c190b72086e2db4d
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: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"
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
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
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
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"
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: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"
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
OSDN Git Service
